Unused imports
Deprecated class, is unused in core.

Should be removed in upcoming releases.
Simplified and made prefix load correct