Drop two unused imports
Fix repeat tag commits issue