DDF-341 removed unused code