Minor updates to custodian_task.
Cleanup.
merge cleanup