more cleanup
Lots more cleanup