after merge cleanup