Clean up and removing of stray debug messages