Remove extraneous logging and tidy up