Remove useless import and fix issue #21