diff --git a/cmd/service/filters.go b/cmd/service/filters.go
index 0236450..b499395 100644
--- a/cmd/service/filters.go
+++ b/cmd/service/filters.go
@@ -14,7 +14,7 @@ var (
 
 func initAddressFilter() filter.Filter {
 	// TODO: Temporary shortcut
-	systemAddress = ko.MustString("chain.system_address")
+	systemAddress = strings.ToLower(ko.MustString("chain.system_address"))
 
 	// TODO: Bootstrap addresses from smart contract
 	// TODO: Add route to update cache
diff --git a/cmd/service/main.go b/cmd/service/main.go
index d6f3929..5d3a00e 100644
--- a/cmd/service/main.go
+++ b/cmd/service/main.go
@@ -11,7 +11,6 @@ import (
 	"github.com/grassrootseconomics/cic-chain-events/internal/pipeline"
 	"github.com/grassrootseconomics/cic-chain-events/internal/pub"
 	"github.com/grassrootseconomics/cic-chain-events/internal/syncer"
-	"github.com/knadh/goyesql/v2"
 	"github.com/knadh/koanf/v2"
 	"github.com/labstack/echo/v4"
 	"github.com/zerodha/logf"
@@ -34,7 +33,6 @@ var (
 
 	ko *koanf.Koanf
 	lo logf.Logger
-	q  goyesql.Queries
 )
 
 func init() {