Issue #4 - Remove unused imports