Cleaning up debug statements