fix more cleanup stuff