and moar cleanup