diff --git a/system_tests/common_test.go b/system_tests/common_test.go
index 7a5296516e..f8ba4c8b77 100644
--- a/system_tests/common_test.go
+++ b/system_tests/common_test.go
@@ -773,7 +773,6 @@ func createL2BlockChainWithStackConfig(
 	stack, err = node.New(stackConfig)
 	Require(t, err)
 
-	// TODO get pebble.ExtraOptions from conf.PersistentConfig when opening the DBs
 	chainDb, err := stack.OpenDatabaseWithExtraOptions("l2chaindata", 0, 0, "l2chaindata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("l2chaindata"))
 	Require(t, err)
 	arbDb, err := stack.OpenDatabaseWithExtraOptions("arbitrumdata", 0, 0, "arbitrumdata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("arbitrumdata"))
@@ -978,7 +977,6 @@ func Create2ndNodeWithConfig(
 	l2stack, err := node.New(stackConfig)
 	Require(t, err)
 
-	// TODO get pebble.ExtraOptions from conf.PersistentConfig when opening the DBs
 	l2chainDb, err := l2stack.OpenDatabaseWithExtraOptions("l2chaindata", 0, 0, "l2chaindata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("l2chaindata"))
 	Require(t, err)
 	l2arbDb, err := l2stack.OpenDatabaseWithExtraOptions("arbitrumdata", 0, 0, "arbitrumdata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("arbitrumdata"))
diff --git a/system_tests/das_test.go b/system_tests/das_test.go
index 2febadb3d2..11d887315a 100644
--- a/system_tests/das_test.go
+++ b/system_tests/das_test.go
@@ -178,7 +178,6 @@ func TestDASRekey(t *testing.T) {
 	l2stackA, err := node.New(stackConfig)
 	Require(t, err)
 
-	// TODO get pebble.ExtraOptions from conf.PersistentConfig
 	l2chainDb, err := l2stackA.OpenDatabaseWithExtraOptions("l2chaindata", 0, 0, "l2chaindata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("l2chaindata"))
 	Require(t, err)
 
diff --git a/system_tests/pruning_test.go b/system_tests/pruning_test.go
index d2453887ee..041781ac48 100644
--- a/system_tests/pruning_test.go
+++ b/system_tests/pruning_test.go
@@ -65,7 +65,6 @@ func TestPruning(t *testing.T) {
 		stack, err := node.New(builder.l2StackConfig)
 		Require(t, err)
 		defer stack.Close()
-		// TODO get pebble.ExtraOptions from conf.PersistentConfig
 		chainDb, err := stack.OpenDatabaseWithExtraOptions("l2chaindata", 0, 0, "l2chaindata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("l2chaindata"))
 		Require(t, err)
 		defer chainDb.Close()
diff --git a/system_tests/staterecovery_test.go b/system_tests/staterecovery_test.go
index 459a6e3ee8..a20cffc787 100644
--- a/system_tests/staterecovery_test.go
+++ b/system_tests/staterecovery_test.go
@@ -50,7 +50,6 @@ func TestRectreateMissingStates(t *testing.T) {
 		stack, err := node.New(builder.l2StackConfig)
 		Require(t, err)
 		defer stack.Close()
-		// TODO get pebble.ExtraOptions from conf.PersistentConfig
 		chainDb, err := stack.OpenDatabaseWithExtraOptions("l2chaindata", 0, 0, "l2chaindata/", false, conf.PersistentConfigDefault.Pebble.ExtraOptions("l2chaindata"))
 		Require(t, err)
 		defer chainDb.Close()