Flake8 cleanup star imports

Removing all star imports, which uncovered a few indirect or missing imports