Tidy up debug statements