Remove useless imports
Migrate OverviewEditro to EEF 1.2 and clean-up various things