Revert "Removed AddDeleteHandler.  Completely redundant and consumed lots of memory."

This reverts commit a3356104ed64033ce09d91ba1a8fb1b84c73de48.