[meta] Moar cleanup