Remove the delete handler infavor of a better code

Relate to issue #2087