DDF-551 Removed unnecessary code and cleaned up imports.