Clean up unused imports, dead code.