Some small fixes

Some small fixes/cleanups:
- remove not needed imports
- add missing imports
- remove unused variables
- fix order of imports