Clean up doc strings and unused imports
8 files changed