Tidy up some debug statements