moar cleanup
moar cleanup