Fix: FCQN vs. proper imports

This PR

- removes unused imports
- avoids FQCNs by using proper imports