diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/sqlite/InternalSqlitePlaygroundFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/sqlite/InternalSqlitePlaygroundFragment.kt
index f822f9c103..3102034308 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/sqlite/InternalSqlitePlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/sqlite/InternalSqlitePlaygroundFragment.kt
@@ -50,8 +50,8 @@ import org.signal.core.ui.compose.ComposeFragment
 import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.SignalIcons
+import org.signal.core.util.Hex
 import org.signal.core.util.Util
-import org.signal.libsignal.protocol.util.Hex
 import org.thoughtcrime.securesms.components.settings.app.internal.sqlite.InternalSqlitePlaygroundViewModel.QueryResult
 
 class InternalSqlitePlaygroundFragment : ComposeFragment() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiDownloader.java b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiDownloader.java
index 4c1bd3ab57..84c9a1d362 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiDownloader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiDownloader.java
@@ -6,8 +6,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 
-import com.mobilecoin.lib.util.Hex;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -22,6 +20,8 @@ import okio.Okio;
 import okio.Sink;
 import okio.Source;
 
+import org.signal.core.util.Hex;
+
 /**
  * Helper for downloading Emoji files via {@link EmojiRemote}.
  */
@@ -93,7 +93,7 @@ public class EmojiDownloader {
         savedMd5 = EmojiFiles.getMd5(context, version, name.getUuid());
       }
 
-      if (!Arrays.equals(savedMd5, Hex.toByteArray(responseMD5))) {
+      if (!Arrays.equals(savedMd5, Hex.fromStringCondensed(responseMD5))) {
         EmojiFiles.delete(context, version, name.getUuid());
         throw new IOException("MD5 Mismatch.");
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/ServiceConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/payments/ServiceConfig.kt
index 87e024e9be..ff0a4a1fd3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/ServiceConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/ServiceConfig.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.payments
 
-import com.mobilecoin.lib.util.Hex
+import org.signal.core.util.Hex
 
 /**
  * Represents the service configuration values for a given MobileCoin config, used to build
@@ -13,8 +13,8 @@ class ServiceConfig(
   view: String,
   val hardeningAdvisories: Array<String>
 ) {
-  val consensus: ByteArray = Hex.toByteArray(consensus)
-  val report: ByteArray = Hex.toByteArray(report)
-  val ledger: ByteArray = Hex.toByteArray(ledger)
-  val view: ByteArray = Hex.toByteArray(view)
+  val consensus: ByteArray = Hex.fromStringCondensed(consensus)
+  val report: ByteArray = Hex.fromStringCondensed(report)
+  val ledger: ByteArray = Hex.fromStringCondensed(ledger)
+  val view: ByteArray = Hex.fromStringCondensed(view)
 }
diff --git a/core/util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java b/core/util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java
index be0b0ee840..db58bf447c 100644
--- a/core/util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java
+++ b/core/util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java
@@ -6,7 +6,6 @@
 package org.signal.core.util;
 
 import org.junit.Test;
-import org.signal.libsignal.protocol.util.Hex;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/demo/registration/src/main/java/org/signal/registration/sample/dependencies/DemoNetworkController.kt b/demo/registration/src/main/java/org/signal/registration/sample/dependencies/DemoNetworkController.kt
index 932b56d963..9b4870e43f 100644
--- a/demo/registration/src/main/java/org/signal/registration/sample/dependencies/DemoNetworkController.kt
+++ b/demo/registration/src/main/java/org/signal/registration/sample/dependencies/DemoNetworkController.kt
@@ -23,13 +23,13 @@ import org.signal.core.models.MasterKey
 import org.signal.core.models.ServiceId
 import org.signal.core.models.backup.MessageBackupKey
 import org.signal.core.util.Base64
+import org.signal.core.util.Hex
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.net.Network
 import org.signal.libsignal.net.RequestResult
 import org.signal.libsignal.protocol.IdentityKey
 import org.signal.libsignal.protocol.IdentityKeyPair
 import org.signal.libsignal.protocol.ecc.ECPrivateKey
-import org.signal.libsignal.protocol.util.Hex
 import org.signal.libsignal.zkgroup.GenericServerPublicParams
 import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialRequestContext
 import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialResponse
diff --git a/feature/registration/src/main/java/org/signal/registration/RegistrationRepository.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationRepository.kt
index c13ceac246..a40baa8040 100644
--- a/feature/registration/src/main/java/org/signal/registration/RegistrationRepository.kt
+++ b/feature/registration/src/main/java/org/signal/registration/RegistrationRepository.kt
@@ -353,7 +353,7 @@ class RegistrationRepository(val context: Context, val networkController: Networ
     val newMasterKey = keyMaterial.accountEntropyPool.deriveMasterKey()
     val newRecoveryPassword = newMasterKey.deriveRegistrationRecoveryPassword()
 
-    SensitiveLog.d(TAG, "[registerAccount] Using master key [${org.signal.libsignal.protocol.util.Hex.toStringCondensed(newMasterKey.serialize())}] and RRP [$newRecoveryPassword]")
+    SensitiveLog.d(TAG, "[registerAccount] Using master key [${org.signal.core.util.Hex.toStringCondensed(newMasterKey.serialize())}] and RRP [$newRecoveryPassword]")
 
     val accountAttributes = AccountAttributes(
       signalingKey = null,
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
index aa63c12920..8f719a1838 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
@@ -16,9 +16,9 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import org.signal.core.models.MasterKey
+import org.signal.core.util.Hex
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.net.RequestResult
-import org.signal.libsignal.protocol.util.Hex
 import org.signal.registration.NetworkController
 import org.signal.registration.RegistrationFlowEvent
 import org.signal.registration.RegistrationFlowState