Did some more work on engine.
Removed unused imports.