Revert "Revert "Removed unused imports (test check-in to see if pull can be done)""

This reverts commit 5c532d61a045b8ff12250ceaf68201b196039979.