Cleanup: Removed unused imports
Some previous cleanups

Basically to reduce code length, improve readability and ease further
modifications.