post-merge cleanups