Tidy up before adding Gen1 Implicits
Tidy up before adding Gen1 implicits, part 2