DDF-670 - Edit Mode and module.js cleanup.