post-merge cleanup