Tidy up after merge: round 2