moar cleanup...