Pre-merge cleanup.