Removed unused imports and re-removed two edit mode classes.