Remove unneeded imports so flake8 can pass