Issue #2 : remove unused imports