More cleanup. Deleting unneeded imports and code that wasn't used.
Merge remote-tracking branch 'origin'
More Cleanup.