cleaning up pre-merge