some corrections of cleanup