Cleaned up a few unused imports.