Removed unneeded imports
Merge from upstream