Issue #82 related: Cleanup some debug statements.