Clean up before merge