fixed

- made it possible to cancel the revert queries
- cleaned up the revert query
- removed some deps