Additional merge cleanup