Removed unused imports mistakenly re-added when rebasing