more cleanup and more