Cleaning up debug messages