improvements to cleanup tasks