Remove some self references, and remove an indent level on clean_old_jobs