remove reversion dependency
Refactoring