DDF-540 Additional cleanup