Improvements to cleanup features