diff --git a/examples/example01/cmd/start.go b/examples/example01/cmd/start.go
index f3fc764803ad366ba6b9b78d2599f3242e573370..d6554a1df02601bb8ffc036c5659150a4404576c 100644
--- a/examples/example01/cmd/start.go
+++ b/examples/example01/cmd/start.go
@@ -43,7 +43,6 @@ import (
 	"code.fbi.h-da.de/danet/gnmi-target/examples/example01/handlers/system"
 	gnmitargetygot "code.fbi.h-da.de/danet/gnmi-target/examples/example01/model"
 	"code.fbi.h-da.de/danet/gnmi-target/handler"
-	not "code.fbi.h-da.de/danet/gnmi-target/internal/notifications"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -104,8 +103,6 @@ var startCmd = &cobra.Command{
 			logrus.Fatal(err)
 		}
 
-		changeDispatcher := not.NewDispatcher()
-
 		// The registered path handlers sorted by priority. If specific
 		// handlers should be able to process their workload before others,
 		// then they should be placed in the front of the slice.
@@ -123,7 +120,7 @@ var startCmd = &cobra.Command{
 			danet.NewAssignForwardingHandler(qkdnClient),
 		}
 
-		gnmitTarget := gnmitarget.NewGnmiTarget(schema, &gnmitargetygot.Gnmitarget{}, gnmitargetygot.ΓModelData, gnmitargetygot.Unmarshal, gnmitargetygot.ΛEnum, changeDispatcher, handlers...)
+		gnmitTarget := gnmitarget.NewGnmiTarget(schema, &gnmitargetygot.Gnmitarget{}, gnmitargetygot.ΓModelData, gnmitargetygot.Unmarshal, gnmitargetygot.ΛEnum, handlers...)
 		if err := gnmitTarget.Start(viper.GetString("bindAddress"), viper.GetString("certFile"), viper.GetString("keyFile"), viper.GetString("caFile"), *insecure); err != nil {
 			logrus.Fatal(err)
 		}
diff --git a/target.go b/target.go
index 7586724efe3b15c14bb5f1ab6df638b1bab62f41..04f0b66411fb977f22c8845a2aa8da943a638683 100644
--- a/target.go
+++ b/target.go
@@ -43,7 +43,6 @@ func NewGnmiTarget(
 	modeldata []*pbGNMI.ModelData,
 	unmarshalFn func(data []byte, destStruct ygot.GoStruct, opts ...ytypes.UnmarshalOpt) error,
 	ΛEnum map[string]map[int64]ygot.EnumDefinition,
-	changeDispatcher *not.Dispatcher,
 	yangHandlers ...handler.PathHandler,
 ) *GnmiTarget {
 	return &GnmiTarget{
@@ -52,7 +51,7 @@ func NewGnmiTarget(
 		modeldata:                 modeldata,
 		unmarshalFn:               unmarshalFn,
 		ΛEnum:                     ΛEnum,
-		YangModelChangeDispatcher: changeDispatcher,
+		YangModelChangeDispatcher: not.NewDispatcher(),
 		yangHandlers:              yangHandlers,
 	}
 }