Removed more unused code related to merging