Removed more merge stuff