Tidy up after merge