Housekeeping

Cleaning up some unused imports and formatting