Removed old cruft code
Removed unused import