removed unused imports etc.