Close #44 - Clean unused imports