Tidy up of incorrect comments and extraneous code