DDF-643  removed commented out code