more cleanup
even moar cleanup