Post-merge cleanups