DDF-142: Removing the rest of DDF references.