Final merge cleanup