move kill into own module