Cleanup of unused imports. Some were generating errors.