Post-merge tidying up