Further merge cleanup