Removes 3 unused imports and fixes #123