diff --git a/RadixWallet/Clients/SubmitTransactionClient/SubmitTransactionClient+Live.swift b/RadixWallet/Clients/SubmitTransactionClient/SubmitTransactionClient+Live.swift
index 3163425540..ae93e2994b 100644
--- a/RadixWallet/Clients/SubmitTransactionClient/SubmitTransactionClient+Live.swift
+++ b/RadixWallet/Clients/SubmitTransactionClient/SubmitTransactionClient+Live.swift
@@ -53,7 +53,7 @@ extension SubmitTransactionClient: DependencyKey {
 			let txID = request.txID
 
 			#if DEBUG
-			Sargon.debugPrintCompiledNotarizedIntent(data: request.compiledNotarizedTXIntent)
+			debugPrintCompiledNotarizedIntent(data: request.compiledNotarizedTXIntent)
 			#endif
 
 			let submitTransactionRequest = GatewayAPI.TransactionSubmitRequest(
diff --git a/RadixWallet/Features/AppFeature/App+Reducer.swift b/RadixWallet/Features/AppFeature/App+Reducer.swift
index dba30cf2bb..21dec694a8 100644
--- a/RadixWallet/Features/AppFeature/App+Reducer.swift
+++ b/RadixWallet/Features/AppFeature/App+Reducer.swift
@@ -16,7 +16,7 @@ public struct App: Sendable, FeatureReducer {
 			root: Root = .splash(.init())
 		) {
 			self.root = root
-			let sargonBuildInfo = Sargon.buildInformation()
+			let sargonBuildInfo = SargonBuildInformation.get()
 			let config = BuildConfiguration.current?.description ?? "Unknown Build Config"
 			loggerGlobal.info("App started (\(config), Sargon=\(sargonBuildInfo))")
 		}
diff --git a/RadixWallet/Features/SettingsFeature/Settings+View.swift b/RadixWallet/Features/SettingsFeature/Settings+View.swift
index 67f5685b6b..70e2258113 100644
--- a/RadixWallet/Features/SettingsFeature/Settings+View.swift
+++ b/RadixWallet/Features/SettingsFeature/Settings+View.swift
@@ -27,7 +27,7 @@ extension Settings {
 
 		init(state: Settings.State) {
 			#if DEBUG
-			let retCommitHash: String = Sargon.buildInformation().radixEngineVersion
+			let retCommitHash: String = SargonBuildInformation.get().radixEngineVersion
 			self.debugAppInfo = "RET #\(retCommitHash), SS \(RadixConnectConstants.defaultSignalingServer.absoluteString)"
 			#endif
 
diff --git a/RadixWallet/SARGON/WrappingRadixEngineToolkit/HighLevel/RET_Sargon_API_dummy.swift b/RadixWallet/SARGON/WrappingRadixEngineToolkit/HighLevel/RET_Sargon_API_dummy.swift
index 0efac4d11e..2bc23be47e 100644
--- a/RadixWallet/SARGON/WrappingRadixEngineToolkit/HighLevel/RET_Sargon_API_dummy.swift
+++ b/RadixWallet/SARGON/WrappingRadixEngineToolkit/HighLevel/RET_Sargon_API_dummy.swift
@@ -93,16 +93,16 @@ extension ResourceAddress {
 	}
 }
 
-extension Sargon {
-	public static func buildInformation() -> SargonBuildInformation {
-		SargonBuildInformation()
-	}
-
-	public static func debugPrintCompiledNotarizedIntent(data: Data) -> String {
+extension SargonBuildInformation {
+	public static func get() -> Self {
 		sargon()
 	}
 }
 
+public func debugPrintCompiledNotarizedIntent(data: Data) -> String {
+	sargon()
+}
+
 extension Data {
 	func hash() -> Data {
 		sargon()