Remove the delte handler infavor of a better code.

Relate to issue #2087