Added deleting of watchpoints