more cleanup and work