DDF-447  removed commented out code