Update manual version to fix issue #2. Remove some unused imports.