cleans up some unused imports and comments