Remove unused imports and correct import ordering