Remove more merge code