More post-merge cleanup