pre-merge cleanup to minimize diffs