Removal of debug logging