Clean up
Issue #88
Issue #88
Issue #88
Removed unused import