Forgotten merge cleanup