diff --git a/VERSION b/VERSION
index 26aaba0..538ee20 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1-dev
diff --git a/internal/bbsim/responders/sadis/sadis.go b/internal/bbsim/responders/sadis/sadis.go
index 34bf600..5b71a94 100644
--- a/internal/bbsim/responders/sadis/sadis.go
+++ b/internal/bbsim/responders/sadis/sadis.go
@@ -162,10 +162,7 @@
 	uniSuffix := "-" + uniId
 
 	sonuv2 := &SadisOnuEntryV2{
-		ID:        onu.Sn() + uniSuffix,
-		NasPortID: onu.Sn() + uniSuffix,
-		CircuitID: onu.Sn() + uniSuffix,
-		RemoteID:  onu.Sn() + uniSuffix,
+		ID: onu.Sn() + uniSuffix,
 	}
 
 	// createUniTagList
diff --git a/internal/bbsim/responders/sadis/sadis_test.go b/internal/bbsim/responders/sadis/sadis_test.go
index 27e43bc..76facb5 100644
--- a/internal/bbsim/responders/sadis/sadis_test.go
+++ b/internal/bbsim/responders/sadis/sadis_test.go
@@ -57,7 +57,6 @@
 	assert.NilError(t, err)
 
 	assert.Equal(t, entry.ID, fmt.Sprintf("%s-%s", onu.Sn(), uni))
-	assert.Equal(t, entry.RemoteID, fmt.Sprintf("%s-%s", onu.Sn(), uni))
 
 	assert.Equal(t, entry.UniTagList[0].PonCTag, 923)
 	assert.Equal(t, entry.UniTagList[0].PonSTag, 900)
@@ -92,7 +91,6 @@
 	assert.NilError(t, err)
 
 	assert.Equal(t, entry.ID, fmt.Sprintf("%s-%s", onu.Sn(), uni))
-	assert.Equal(t, entry.RemoteID, fmt.Sprintf("%s-%s", onu.Sn(), uni))
 
 	assert.Equal(t, len(entry.UniTagList), 3)