major cleanup
more cleanup