fixes to cleanup tasks