Remove unused stuff
Remove unused imports
Add package req