Lint Fixes

Mostly because we now complain about unused imports