DDF-908  removed commented out code