moar cleanup! MOAR!