Tidy up some duped strings

Change-Id: I60f2b301818546c85de599af750590d65867fce8