Quick cleanup before merge