final merge cleanup