Moar cleanup.