diff --git a/config/settings.example.json b/config/settings.example.json
deleted file mode 100644
index 77add36..0000000
--- a/config/settings.example.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "RelayerPrivateKey": "RELAYER_PRIVATE_KEY",
-  "PowerloomReportingUrl": "POWERLOOM_REPORTING_URL",
-  "SignerAccountAddress": "SIGNER_ACCOUNT_ADDRESS",
-  "LocalCollectorPort": "LOCAL_COLLECTOR_PORT",
-  "TrustedRelayersListUrl" : "TRUSTED_RELAYERS_LIST_URL",
-  "DataMarketAddress" : "DATA_MARKET_CONTRACT",
-  "MaxStreamPoolSize" : MAX_STREAM_POOL_SIZE,
-  "StreamPoolHealthCheckInterval" : STREAM_POOL_HEALTH_CHECK_INTERVAL
-}
diff --git a/config/settings.go b/config/settings.go
index 96a8ef8..f4e5c07 100644
--- a/config/settings.go
+++ b/config/settings.go
@@ -20,12 +20,12 @@ type Settings struct {
 	TrustedRelayersListUrl string
 	DataMarketAddress      string
 	MaxStreamPoolSize      int
-	HealthCheckInterval    int // Added based on STREAM_POOL_HEALTH_CHECK_INTERVAL
+	DataMarketInRequest    bool
 }
 
 func LoadConfig() {
 	config := Settings{}
-	
+
 	// Required fields
 	if port := os.Getenv("LOCAL_COLLECTOR_PORT"); port != "" {
 		config.PortNumber = port
@@ -38,11 +38,15 @@ func LoadConfig() {
 	} else {
 		config.DataMarketAddress = contract
 	}
-
+	if value := os.Getenv("DATA_MARKET_IN_REQUEST"); value == "true" {
+		config.DataMarketInRequest = true
+	} else {
+		config.DataMarketInRequest = false
+	}
 	// Optional fields with defaults
 	config.PowerloomReportingUrl = os.Getenv("POWERLOOM_REPORTING_URL")
 	config.SignerAccountAddress = os.Getenv("SIGNER_ACCOUNT_ADDRESS")
-	config.TrustedRelayersListUrl = getEnvWithDefault("TRUSTED_RELAYERS_LIST_URL", 
+	config.TrustedRelayersListUrl = getEnvWithDefault("TRUSTED_RELAYERS_LIST_URL",
 		"https://raw.githubusercontent.com/PowerLoom/snapshotter-lite-local-collector/feat/trusted-relayers/relayers.json")
 
 	// Load private key from file or env
@@ -50,7 +54,6 @@ func LoadConfig() {
 
 	// Numeric values with defaults
 	config.MaxStreamPoolSize = getEnvAsInt("MAX_STREAM_POOL_SIZE", 2)
-	config.HealthCheckInterval = getEnvAsInt("STREAM_POOL_HEALTH_CHECK_INTERVAL", 30)
 
 	SettingsObj = &config
 }
diff --git a/pkgs/service/msg_server.go b/pkgs/service/msg_server.go
index 10fdca9..ed62aa3 100644
--- a/pkgs/service/msg_server.go
+++ b/pkgs/service/msg_server.go
@@ -103,9 +103,11 @@ func (s *server) SubmitSnapshot(ctx context.Context, submission *pkgs.SnapshotSu
 	}
 
 	submissionBytes := append(submissionIdBytes, subBytes...)
-	// Convert to checksum address using go-ethereum's utility
-	checksummedAddress := common.HexToAddress(config.SettingsObj.DataMarketAddress).Hex()
-	submissionBytes = append([]byte(checksummedAddress), submissionBytes...)
+	if config.SettingsObj.DataMarketInRequest {
+		// Convert to checksum address using go-ethereum's utility
+		checksummedAddress := common.HexToAddress(config.SettingsObj.DataMarketAddress).Hex()
+		submissionBytes = append([]byte(checksummedAddress), submissionBytes...)
+	}
 	go func() {
 		err := s.writeToStream(submissionBytes)