DDF-170: removed unused code