More merge cleanup