Clean-up and fixes

Cleaned out some imports and fixed annotations in a few files