add handler deletion code