Remove unused imports from previous revision