Issue #109 - Cleanup, remove unused import