Remove verbose logging and extraneous debug. Fixes #1904