Removal of debug messages