Cleanup: Remove unused export code
Some cleanups

* Removed unused imports
* Reduce code length
* Improve readability