Removed unused imports and resolved #22.