DDF-579  removed commented out code