Minor 1.6.2 Cleanups

Fixed dependency information
Removed a lot of unnecessary imports.
Fixed some compilation warnings