Pre-merge cleanup