DDF-656: removed commented out code