pre-merge cleanup