Removed AddDeleteHandler.  Completely redundant and consumed lots of memory.

Change-Id: I392f5ef2ec715e2fea04c09b41bbe5af90db415d