Issue #64: removed diagnostic code