Nuke reliance on a non-existant dependency
Remove unused imports