Cleanup of unused imports. Some were generating errors.
Fix for unused, deprecated imports.