Removed old stuff.
Removed unused import.