DDF-696  removed commented out return statement