Eliminate some outdated imports to fix tests.