removed unused imports etc