Cleanup before merge