make cleanup safety fix more explicit