Second merge cleanup