DDF-61: removed commented out code