clean up before merge