Clean-up pre-merge.