Tidy up after last merge