Some cleanup.
Removed unused import