Removed yet more unused imports.