Refactor economy related classes

Removed unused imports and the general Economy class, which wouldn't be
available when no Economy has been found!