Tidy up of incorrect comments and extraneous methods