even moar cleanup!