Remove some debug code.
More debug logging and a new logging category.