Remove unused imports and get rid of Auth