refactor + stub for cleanup job