Separate full reset operation from "catch all replies" handler
Separate incremental update operation from "catch all replies" handler

Catch all handler was removed
Remove dead code.