Fix: Remove unused imports
Merge branch 'localheinz-bugfix/unused-imports'
Fix mergeconflict