Fixes, removed unused imports