diff --git a/Scripts/sds_codegen/sds_generate.py b/Scripts/sds_codegen/sds_generate.py
index c677039a2f..4e8418fbec 100755
--- a/Scripts/sds_codegen/sds_generate.py
+++ b/Scripts/sds_codegen/sds_generate.py
@@ -426,20 +426,11 @@ class TypeInfo:
             conversion_method = conversion_map[self.swift_type()]
             if conversion_method is None:
                 fail('Could not convert:', self.swift_type())
-            serialization_conversion = '$0.%s' % ( conversion_method, )
-            if self.swift_type() == 'UInt64':
-                serialization_conversion = 'serializationSafeUInt64(%s)' % ( serialization_conversion, )
-            elif self.swift_type() == 'UInt':
-                serialization_conversion = 'serializationSafeUInt(%s)' % ( serialization_conversion, )
-            serialization_conversion = '{ %s }' % ( serialization_conversion, )
+            serialization_conversion = '{ $0.%s }' % ( conversion_method, )
             if is_optional or did_force_optional:
                 return 'archiveOptionalNSNumber(%s, conversion: %s)' % ( value_expr, serialization_conversion, )
             else:
                 return 'archiveNSNumber(%s, conversion: %s)' % ( value_expr, serialization_conversion, )
-        elif self.swift_type() == 'UInt64':
-            value_expr = 'serializationSafeUInt64(%s)' % ( value_expr, )
-        elif self.swift_type() == 'UInt':
-            value_expr = 'serializationSafeUInt(%s)' % ( value_expr, )
 
         return value_expr
     
diff --git a/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift b/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift
index 6b9550f345..867b46855c 100644
--- a/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift
+++ b/SignalServiceKit/src/Contacts/SignalAccount+SDS.swift
@@ -574,7 +574,7 @@ class SignalAccountSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let accountSchemaVersion: UInt = serializationSafeUInt(model.accountSchemaVersion)
+        let accountSchemaVersion: UInt = model.accountSchemaVersion
         let contact: Data? = optionalArchive(model.contact)
         let hasMultipleAccountContact: Bool = model.hasMultipleAccountContact
         let multipleAccountLabelText: String = model.multipleAccountLabelText
diff --git a/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift b/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift
index ab104ca61f..6827a20f67 100644
--- a/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift
+++ b/SignalServiceKit/src/Contacts/SignalRecipient+SDS.swift
@@ -562,7 +562,7 @@ class SignalRecipientSerializer: SDSSerializer {
         // Base class properties
         let devices: Data = requiredArchive(model.devices)
         let recipientPhoneNumber: String? = model.recipientPhoneNumber
-        let recipientSchemaVersion: UInt = serializationSafeUInt(model.recipientSchemaVersion)
+        let recipientSchemaVersion: UInt = model.recipientSchemaVersion
         let recipientUUID: String? = model.recipientUUID
 
         return SignalRecipientRecord(id: id, recordType: recordType, uniqueId: uniqueId, devices: devices, recipientPhoneNumber: recipientPhoneNumber, recipientSchemaVersion: recipientSchemaVersion, recipientUUID: recipientUUID)
diff --git a/SignalServiceKit/src/Contacts/TSThread+SDS.swift b/SignalServiceKit/src/Contacts/TSThread+SDS.swift
index 46816da242..fec0e4a920 100644
--- a/SignalServiceKit/src/Contacts/TSThread+SDS.swift
+++ b/SignalServiceKit/src/Contacts/TSThread+SDS.swift
@@ -706,7 +706,7 @@ class TSThreadSerializer: SDSSerializer {
 
         // Base class properties
         let archivalDate: Double? = archiveOptionalDate(model.archivalDate)
-        let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { serializationSafeUInt64($0.uint64Value) })
+        let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { $0.uint64Value })
         let conversationColorName: String = model.conversationColorName.rawValue
         let creationDate: Double? = archiveOptionalDate(model.creationDate)
         let isArchivedByLegacyTimestampForSorting: Bool = model.isArchivedByLegacyTimestampForSorting
diff --git a/SignalServiceKit/src/Contacts/Threads/TSContactThread+SDS.swift b/SignalServiceKit/src/Contacts/Threads/TSContactThread+SDS.swift
index 3407ef9085..ef466fcaf2 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSContactThread+SDS.swift
+++ b/SignalServiceKit/src/Contacts/Threads/TSContactThread+SDS.swift
@@ -62,7 +62,7 @@ class TSContactThreadSerializer: SDSSerializer {
 
         // Base class properties
         let archivalDate: Double? = archiveOptionalDate(model.archivalDate)
-        let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { serializationSafeUInt64($0.uint64Value) })
+        let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { $0.uint64Value })
         let conversationColorName: String = model.conversationColorName.rawValue
         let creationDate: Double? = archiveOptionalDate(model.creationDate)
         let isArchivedByLegacyTimestampForSorting: Bool = model.isArchivedByLegacyTimestampForSorting
@@ -73,7 +73,7 @@ class TSContactThreadSerializer: SDSSerializer {
 
         // Subclass properties
         let contactPhoneNumber: String? = model.contactPhoneNumber
-        let contactThreadSchemaVersion: UInt? = serializationSafeUInt(model.contactThreadSchemaVersion)
+        let contactThreadSchemaVersion: UInt? = model.contactThreadSchemaVersion
         let contactUUID: String? = model.contactUUID
         let groupModel: Data? = nil
         let hasDismissedOffers: Bool? = model.hasDismissedOffers
diff --git a/SignalServiceKit/src/Contacts/Threads/TSGroupThread+SDS.swift b/SignalServiceKit/src/Contacts/Threads/TSGroupThread+SDS.swift
index 830cbc830b..7c5fc17e43 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread+SDS.swift
+++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread+SDS.swift
@@ -62,7 +62,7 @@ class TSGroupThreadSerializer: SDSSerializer {
 
         // Base class properties
         let archivalDate: Double? = archiveOptionalDate(model.archivalDate)
-        let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { serializationSafeUInt64($0.uint64Value) })
+        let archivedAsOfMessageSortId: UInt64? = archiveOptionalNSNumber(model.archivedAsOfMessageSortId, conversion: { $0.uint64Value })
         let conversationColorName: String = model.conversationColorName.rawValue
         let creationDate: Double? = archiveOptionalDate(model.creationDate)
         let isArchivedByLegacyTimestampForSorting: Bool = model.isArchivedByLegacyTimestampForSorting
diff --git a/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift b/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift
index 3bc4e37046..78e5ab8d3a 100644
--- a/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift
+++ b/SignalServiceKit/src/Devices/OWSLinkedDeviceReadReceipt+SDS.swift
@@ -566,9 +566,9 @@ class OWSLinkedDeviceReadReceiptSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let linkedDeviceReadReceiptSchemaVersion: UInt = serializationSafeUInt(model.linkedDeviceReadReceiptSchemaVersion)
-        let messageIdTimestamp: UInt64 = serializationSafeUInt64(model.messageIdTimestamp)
-        let readTimestamp: UInt64 = serializationSafeUInt64(model.readTimestamp)
+        let linkedDeviceReadReceiptSchemaVersion: UInt = model.linkedDeviceReadReceiptSchemaVersion
+        let messageIdTimestamp: UInt64 = model.messageIdTimestamp
+        let readTimestamp: UInt64 = model.readTimestamp
         let senderPhoneNumber: String? = model.senderPhoneNumber
         let senderUUID: String? = model.senderUUID
 
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift b/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift
index c48f64c48f..35f65a3975 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachment+SDS.swift
@@ -778,14 +778,14 @@ class TSAttachmentSerializer: SDSSerializer {
 
         // Base class properties
         let albumMessageId: String? = model.albumMessageId
-        let attachmentSchemaVersion: UInt = serializationSafeUInt(model.attachmentSchemaVersion)
+        let attachmentSchemaVersion: UInt = model.attachmentSchemaVersion
         let attachmentType: TSAttachmentType = model.attachmentType
         let byteCount: UInt32 = model.byteCount
         let caption: String? = model.caption
         let contentType: String = model.contentType
         let encryptionKey: Data? = model.encryptionKey
         let isDownloaded: Bool = model.isDownloaded
-        let serverId: UInt64 = serializationSafeUInt64(model.serverId)
+        let serverId: UInt64 = model.serverId
         let sourceFilename: String? = model.sourceFilename
 
         // Subclass properties
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer+SDS.swift b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer+SDS.swift
index 58f306ef07..2bd2c77ebe 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer+SDS.swift
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentPointer+SDS.swift
@@ -62,14 +62,14 @@ class TSAttachmentPointerSerializer: SDSSerializer {
 
         // Base class properties
         let albumMessageId: String? = model.albumMessageId
-        let attachmentSchemaVersion: UInt = serializationSafeUInt(model.attachmentSchemaVersion)
+        let attachmentSchemaVersion: UInt = model.attachmentSchemaVersion
         let attachmentType: TSAttachmentType = model.attachmentType
         let byteCount: UInt32 = model.byteCount
         let caption: String? = model.caption
         let contentType: String = model.contentType
         let encryptionKey: Data? = model.encryptionKey
         let isDownloaded: Bool = model.isDownloaded
-        let serverId: UInt64 = serializationSafeUInt64(model.serverId)
+        let serverId: UInt64 = model.serverId
         let sourceFilename: String? = model.sourceFilename
 
         // Subclass properties
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream+SDS.swift b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream+SDS.swift
index e6196f51a2..445f5a2e7b 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream+SDS.swift
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream+SDS.swift
@@ -62,14 +62,14 @@ class TSAttachmentStreamSerializer: SDSSerializer {
 
         // Base class properties
         let albumMessageId: String? = model.albumMessageId
-        let attachmentSchemaVersion: UInt = serializationSafeUInt(model.attachmentSchemaVersion)
+        let attachmentSchemaVersion: UInt = model.attachmentSchemaVersion
         let attachmentType: TSAttachmentType = model.attachmentType
         let byteCount: UInt32 = model.byteCount
         let caption: String? = model.caption
         let contentType: String = model.contentType
         let encryptionKey: Data? = model.encryptionKey
         let isDownloaded: Bool = model.isDownloaded
-        let serverId: UInt64 = serializationSafeUInt64(model.serverId)
+        let serverId: UInt64 = model.serverId
         let sourceFilename: String? = model.sourceFilename
 
         // Subclass properties
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSContactOffersInteraction+SDS.swift b/SignalServiceKit/src/Messages/Interactions/OWSContactOffersInteraction+SDS.swift
index bfda620468..f74d197a0f 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSContactOffersInteraction+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSContactOffersInteraction+SDS.swift
@@ -61,8 +61,8 @@ class OWSContactOffersInteractionSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage+SDS.swift
index 88927aa768..4ab942a2f2 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSDisappearingConfigurationUpdateInfoMessage+SDS.swift
@@ -61,8 +61,8 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -94,7 +94,7 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
         let incomingMessageSchemaVersion: UInt? = nil
-        let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
+        let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = nil
         let isViewOnceComplete: Bool? = model.isViewOnceComplete
@@ -114,7 +114,7 @@ class OWSDisappearingConfigurationUpdateInfoMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage+SDS.swift
index 24bf4642a5..31e09966e5 100644
--- a/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/OWSVerificationStateChangeMessage+SDS.swift
@@ -61,8 +61,8 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -94,7 +94,7 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
         let incomingMessageSchemaVersion: UInt? = nil
-        let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
+        let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = model.isLocalChange
         let isViewOnceComplete: Bool? = model.isViewOnceComplete
@@ -114,7 +114,7 @@ class OWSVerificationStateChangeMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = optionalArchive(model.recipientAddress)
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage+SDS.swift
index af886ed56e..54c7f4b52f 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSErrorMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -82,10 +82,10 @@ class TSErrorMessageSerializer: SDSSerializer {
         let createdInExistingGroup: Bool? = nil
         let customMessage: String? = nil
         let envelopeData: Data? = nil
-        let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
+        let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
         let errorType: TSErrorMessageType? = model.errorType
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -114,7 +114,7 @@ class TSErrorMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = optionalArchive(model.recipientAddress)
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage+SDS.swift
index 17d7de3bf0..487d06a90b 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSIncomingMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSIncomingMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class TSIncomingMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -93,7 +93,7 @@ class TSIncomingMessageSerializer: SDSSerializer {
         let hasBlockOffer: Bool? = nil
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
-        let incomingMessageSchemaVersion: UInt? = serializationSafeUInt(model.incomingMessageSchemaVersion)
+        let incomingMessageSchemaVersion: UInt? = model.incomingMessageSchemaVersion
         let infoMessageSchemaVersion: UInt? = nil
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = nil
@@ -114,9 +114,9 @@ class TSIncomingMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
-        let serverTimestamp: UInt64? = archiveOptionalNSNumber(model.serverTimestamp, conversion: { serializationSafeUInt64($0.uint64Value) })
+        let serverTimestamp: UInt64? = archiveOptionalNSNumber(model.serverTimestamp, conversion: { $0.uint64Value })
         let sourceDeviceId: UInt32? = model.sourceDeviceId
         let storedMessageState: TSOutgoingMessageState? = nil
         let storedShouldStartExpireTimer: Bool? = model.storedShouldStartExpireTimer
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage+SDS.swift
index f4a2a301db..1bba1c8dc2 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInfoMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSInfoMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSInfoMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class TSInfoMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -94,7 +94,7 @@ class TSInfoMessageSerializer: SDSSerializer {
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
         let incomingMessageSchemaVersion: UInt? = nil
-        let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
+        let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = nil
         let isViewOnceComplete: Bool? = model.isViewOnceComplete
@@ -114,7 +114,7 @@ class TSInfoMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift
index d4a1c95572..95465e3a25 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSInteraction+SDS.swift
@@ -1803,8 +1803,8 @@ class TSInteractionSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
diff --git a/SignalServiceKit/src/Messages/Interactions/TSMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSMessage+SDS.swift
index b38edce477..d1d613c1ce 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class TSMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -114,7 +114,7 @@ class TSMessageSerializer: SDSSerializer {
         let read: Bool? = nil
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage+SDS.swift
index 534bc518e3..9270a6dce6 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSOutgoingMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSOutgoingMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class TSOutgoingMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = model.groupMetaMessage
         let hasAddToContactsOffer: Bool? = nil
@@ -107,14 +107,14 @@ class TSOutgoingMessageSerializer: SDSSerializer {
         let messageSticker: Data? = optionalArchive(model.messageSticker)
         let messageType: TSInfoMessageType? = nil
         let mostRecentFailureText: String? = model.mostRecentFailureText
-        let outgoingMessageSchemaVersion: UInt? = serializationSafeUInt(model.outgoingMessageSchemaVersion)
+        let outgoingMessageSchemaVersion: UInt? = model.outgoingMessageSchemaVersion
         let preKeyBundle: Data? = nil
         let protocolVersion: UInt? = nil
         let quotedMessage: Data? = optionalArchive(model.quotedMessage)
         let read: Bool? = nil
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = optionalArchive(model.recipientAddressStates)
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction+SDS.swift b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction+SDS.swift
index aa4ffb15a1..10945abd00 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction+SDS.swift
+++ b/SignalServiceKit/src/Messages/Interactions/TSUnreadIndicatorInteraction+SDS.swift
@@ -61,8 +61,8 @@ class TSUnreadIndicatorInteractionSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage+SDS.swift b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage+SDS.swift
index 658280da61..8751580879 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyErrorMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSInvalidIdentityKeyErrorMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -82,10 +82,10 @@ class TSInvalidIdentityKeyErrorMessageSerializer: SDSSerializer {
         let createdInExistingGroup: Bool? = nil
         let customMessage: String? = nil
         let envelopeData: Data? = nil
-        let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
+        let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
         let errorType: TSErrorMessageType? = model.errorType
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -114,7 +114,7 @@ class TSInvalidIdentityKeyErrorMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = optionalArchive(model.recipientAddress)
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage+SDS.swift b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage+SDS.swift
index 8e5a445bf6..bc5613ad79 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeyReceivingErrorMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSInvalidIdentityKeyReceivingErrorMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -82,10 +82,10 @@ class TSInvalidIdentityKeyReceivingErrorMessageSerializer: SDSSerializer {
         let createdInExistingGroup: Bool? = nil
         let customMessage: String? = nil
         let envelopeData: Data? = model.envelopeData
-        let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
+        let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
         let errorType: TSErrorMessageType? = model.errorType
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -114,7 +114,7 @@ class TSInvalidIdentityKeyReceivingErrorMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = optionalArchive(model.recipientAddress)
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage+SDS.swift b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage+SDS.swift
index 7716587a08..509fa836df 100644
--- a/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/InvalidKeyMessages/TSInvalidIdentityKeySendingErrorMessage+SDS.swift
@@ -61,8 +61,8 @@ class TSInvalidIdentityKeySendingErrorMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -82,10 +82,10 @@ class TSInvalidIdentityKeySendingErrorMessageSerializer: SDSSerializer {
         let createdInExistingGroup: Bool? = nil
         let customMessage: String? = nil
         let envelopeData: Data? = nil
-        let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
+        let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
         let errorType: TSErrorMessageType? = model.errorType
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -114,7 +114,7 @@ class TSInvalidIdentityKeySendingErrorMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = optionalArchive(model.recipientAddress)
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage+SDS.swift b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage+SDS.swift
index e1a62bd2fb..5a35875627 100644
--- a/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/OWSAddToContactsOfferMessage+SDS.swift
@@ -61,8 +61,8 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -94,7 +94,7 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
         let incomingMessageSchemaVersion: UInt? = nil
-        let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
+        let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = nil
         let isViewOnceComplete: Bool? = model.isViewOnceComplete
@@ -114,7 +114,7 @@ class OWSAddToContactsOfferMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage+SDS.swift b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage+SDS.swift
index 1fafb4450f..270e9c9d63 100644
--- a/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/OWSAddToProfileWhitelistOfferMessage+SDS.swift
@@ -61,8 +61,8 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -94,7 +94,7 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
         let incomingMessageSchemaVersion: UInt? = nil
-        let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
+        let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = nil
         let isViewOnceComplete: Bool? = model.isViewOnceComplete
@@ -114,7 +114,7 @@ class OWSAddToProfileWhitelistOfferMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift b/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift
index b44857a90f..059eccba20 100644
--- a/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift
+++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager+SDS.swift
@@ -554,8 +554,8 @@ class TSRecipientReadReceiptSerializer: SDSSerializer {
 
         // Base class properties
         let recipientMap: Data = requiredArchive(model.recipientMap)
-        let recipientReadReceiptSchemaVersion: UInt = serializationSafeUInt(model.recipientReadReceiptSchemaVersion)
-        let sentTimestamp: UInt64 = serializationSafeUInt64(model.sentTimestamp)
+        let recipientReadReceiptSchemaVersion: UInt = model.recipientReadReceiptSchemaVersion
+        let sentTimestamp: UInt64 = model.sentTimestamp
 
         return RecipientReadReceiptRecord(id: id, recordType: recordType, uniqueId: uniqueId, recipientMap: recipientMap, recipientReadReceiptSchemaVersion: recipientReadReceiptSchemaVersion, sentTimestamp: sentTimestamp)
     }
diff --git a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage+SDS.swift b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage+SDS.swift
index 44e41b57f9..13fadd4acf 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/OWSUnknownContactBlockOfferMessage+SDS.swift
@@ -61,8 +61,8 @@ class OWSUnknownContactBlockOfferMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -82,10 +82,10 @@ class OWSUnknownContactBlockOfferMessageSerializer: SDSSerializer {
         let createdInExistingGroup: Bool? = nil
         let customMessage: String? = nil
         let envelopeData: Data? = nil
-        let errorMessageSchemaVersion: UInt? = serializationSafeUInt(model.errorMessageSchemaVersion)
+        let errorMessageSchemaVersion: UInt? = model.errorMessageSchemaVersion
         let errorType: TSErrorMessageType? = model.errorType
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -114,7 +114,7 @@ class OWSUnknownContactBlockOfferMessageSerializer: SDSSerializer {
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = optionalArchive(model.recipientAddress)
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = nil
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
diff --git a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage+SDS.swift b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage+SDS.swift
index 973fbf1c8c..f9b2dc042b 100644
--- a/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage+SDS.swift
+++ b/SignalServiceKit/src/Messages/OWSUnknownProtocolVersionMessage+SDS.swift
@@ -61,8 +61,8 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -84,8 +84,8 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
         let envelopeData: Data? = nil
         let errorMessageSchemaVersion: UInt? = nil
         let errorType: TSErrorMessageType? = nil
-        let expireStartedAt: UInt64? = serializationSafeUInt64(model.expireStartedAt)
-        let expiresAt: UInt64? = serializationSafeUInt64(model.expiresAt)
+        let expireStartedAt: UInt64? = model.expireStartedAt
+        let expiresAt: UInt64? = model.expiresAt
         let expiresInSeconds: UInt32? = model.expiresInSeconds
         let groupMetaMessage: TSGroupMetaMessage? = nil
         let hasAddToContactsOffer: Bool? = nil
@@ -94,7 +94,7 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
         let hasLegacyMessageState: Bool? = nil
         let hasSyncedTranscript: Bool? = nil
         let incomingMessageSchemaVersion: UInt? = nil
-        let infoMessageSchemaVersion: UInt? = serializationSafeUInt(model.infoMessageSchemaVersion)
+        let infoMessageSchemaVersion: UInt? = model.infoMessageSchemaVersion
         let isFromLinkedDevice: Bool? = nil
         let isLocalChange: Bool? = nil
         let isViewOnceComplete: Bool? = model.isViewOnceComplete
@@ -109,18 +109,18 @@ class OWSUnknownProtocolVersionMessageSerializer: SDSSerializer {
         let mostRecentFailureText: String? = nil
         let outgoingMessageSchemaVersion: UInt? = nil
         let preKeyBundle: Data? = nil
-        let protocolVersion: UInt? = serializationSafeUInt(model.protocolVersion)
+        let protocolVersion: UInt? = model.protocolVersion
         let quotedMessage: Data? = optionalArchive(model.quotedMessage)
         let read: Bool? = model.wasRead
         let recipientAddress: Data? = nil
         let recipientAddressStates: Data? = nil
-        let schemaVersion: UInt? = serializationSafeUInt(model.schemaVersion)
+        let schemaVersion: UInt? = model.schemaVersion
         let sender: Data? = optionalArchive(model.sender)
         let serverTimestamp: UInt64? = nil
         let sourceDeviceId: UInt32? = nil
         let storedMessageState: TSOutgoingMessageState? = nil
         let storedShouldStartExpireTimer: Bool? = model.storedShouldStartExpireTimer
-        let unknownProtocolVersionMessageSchemaVersion: UInt? = serializationSafeUInt(model.unknownProtocolVersionMessageSchemaVersion)
+        let unknownProtocolVersionMessageSchemaVersion: UInt? = model.unknownProtocolVersionMessageSchemaVersion
         let unregisteredAddress: Data? = optionalArchive(model.unregisteredAddress)
         let verificationState: OWSVerificationState? = nil
         let wasReceivedByUD: Bool? = nil
diff --git a/SignalServiceKit/src/Messages/TSCall+SDS.swift b/SignalServiceKit/src/Messages/TSCall+SDS.swift
index f178d0e20b..90cbeac953 100644
--- a/SignalServiceKit/src/Messages/TSCall+SDS.swift
+++ b/SignalServiceKit/src/Messages/TSCall+SDS.swift
@@ -61,8 +61,8 @@ class TSCallSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let receivedAtTimestamp: UInt64 = serializationSafeUInt64(model.receivedAtTimestamp)
-        let timestamp: UInt64 = serializationSafeUInt64(model.timestamp)
+        let receivedAtTimestamp: UInt64 = model.receivedAtTimestamp
+        let timestamp: UInt64 = model.timestamp
         let threadUniqueId: String = model.uniqueThreadId
 
         // Subclass properties
@@ -72,7 +72,7 @@ class TSCallSerializer: SDSSerializer {
         let authorUUID: String? = nil
         let beforeInteractionId: String? = nil
         let body: String? = nil
-        let callSchemaVersion: UInt? = serializationSafeUInt(model.callSchemaVersion)
+        let callSchemaVersion: UInt? = model.callSchemaVersion
         let callType: RPRecentCallType? = model.callType
         let configurationDurationSeconds: UInt32? = nil
         let configurationIsEnabled: Bool? = nil
diff --git a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord+SDS.swift b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord+SDS.swift
index eb18e4188d..bf66991e0d 100644
--- a/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord+SDS.swift
+++ b/SignalServiceKit/src/Network/Receiving/SSKMessageDecryptJobRecord+SDS.swift
@@ -61,7 +61,7 @@ class SSKMessageDecryptJobRecordSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let failureCount: UInt = serializationSafeUInt(model.failureCount)
+        let failureCount: UInt = model.failureCount
         let label: String = model.label
         let status: SSKJobRecordStatus = model.status
 
diff --git a/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift b/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift
index bea9e8761e..8537e9bb74 100644
--- a/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift
+++ b/SignalServiceKit/src/Security/OWSRecipientIdentity+SDS.swift
@@ -578,7 +578,7 @@ class OWSRecipientIdentitySerializer: SDSSerializer {
         let createdAt: Double = archiveDate(model.createdAt)
         let identityKey: Data = model.identityKey
         let isFirstKnownKey: Bool = model.isFirstKnownKey
-        let recipientIdentitySchemaVersion: UInt = serializationSafeUInt(model.recipientIdentitySchemaVersion)
+        let recipientIdentitySchemaVersion: UInt = model.recipientIdentitySchemaVersion
         let verificationState: OWSVerificationState = model.verificationState
 
         return RecipientIdentityRecord(id: id, recordType: recordType, uniqueId: uniqueId, accountId: accountId, createdAt: createdAt, identityKey: identityKey, isFirstKnownKey: isFirstKnownKey, recipientIdentitySchemaVersion: recipientIdentitySchemaVersion, verificationState: verificationState)
diff --git a/SignalServiceKit/src/Storage/Database/SDSSerializable.swift b/SignalServiceKit/src/Storage/Database/SDSSerializable.swift
index 62f8cfaf93..c313ae5ca3 100644
--- a/SignalServiceKit/src/Storage/Database/SDSSerializable.swift
+++ b/SignalServiceKit/src/Storage/Database/SDSSerializable.swift
@@ -54,29 +54,4 @@ public extension SDSSerializer {
     func requiredArchive(_ value: Any) -> Data {
         return NSKeyedArchiver.archivedData(withRootObject: value)
     }
-
-    // MARK: - Safe Numerics
-
-    func serializationSafeUInt(_ value: UInt) -> UInt {
-        guard UInt.max > Int64.max else {
-            return value
-        }
-        guard value < Int64.max else {
-            if !CurrentAppContext().isRunningTests {
-                owsFailDebug("Invalid value: \(value)")
-            }
-            return UInt(Int64.max)
-        }
-        return value
-    }
-
-    func serializationSafeUInt64(_ value: UInt64) -> UInt64 {
-        guard value < Int64.max else {
-            if !CurrentAppContext().isRunningTests {
-                owsFailDebug("Invalid value: \(value)")
-            }
-            return UInt64(Int64.max)
-        }
-        return value
-    }
 }
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord+SDS.swift b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord+SDS.swift
index d87b18553f..86db05eec4 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord+SDS.swift
+++ b/SignalServiceKit/src/Storage/Jobs/OWSBroadcastMediaMessageJobRecord+SDS.swift
@@ -61,7 +61,7 @@ class OWSBroadcastMediaMessageJobRecordSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let failureCount: UInt = serializationSafeUInt(model.failureCount)
+        let failureCount: UInt = model.failureCount
         let label: String = model.label
         let status: SSKJobRecordStatus = model.status
 
diff --git a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord+SDS.swift b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord+SDS.swift
index ba222c117b..673ab1ea1d 100644
--- a/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord+SDS.swift
+++ b/SignalServiceKit/src/Storage/Jobs/OWSSessionResetJobRecord+SDS.swift
@@ -61,7 +61,7 @@ class OWSSessionResetJobRecordSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let failureCount: UInt = serializationSafeUInt(model.failureCount)
+        let failureCount: UInt = model.failureCount
         let label: String = model.label
         let status: SSKJobRecordStatus = model.status
 
diff --git a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift
index a7e627cc06..aa71a390b3 100644
--- a/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift
+++ b/SignalServiceKit/src/Storage/Jobs/SSKJobRecord+SDS.swift
@@ -676,7 +676,7 @@ class SSKJobRecordSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let failureCount: UInt = serializationSafeUInt(model.failureCount)
+        let failureCount: UInt = model.failureCount
         let label: String = model.label
         let status: SSKJobRecordStatus = model.status
 
diff --git a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord+SDS.swift b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord+SDS.swift
index 339512a65d..9a223d5214 100644
--- a/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord+SDS.swift
+++ b/SignalServiceKit/src/Storage/SSKMessageSenderJobRecord+SDS.swift
@@ -61,7 +61,7 @@ class SSKMessageSenderJobRecordSerializer: SDSSerializer {
         let uniqueId: String = model.uniqueId
 
         // Base class properties
-        let failureCount: UInt = serializationSafeUInt(model.failureCount)
+        let failureCount: UInt = model.failureCount
         let label: String = model.label
         let status: SSKJobRecordStatus = model.status
 
diff --git a/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift b/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift
index 47203afb50..fc2b479974 100644
--- a/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift
+++ b/SignalServiceKit/src/Util/OWSBackupFragment+SDS.swift
@@ -578,7 +578,7 @@ class OWSBackupFragmentSerializer: SDSSerializer {
         let encryptionKey: Data = model.encryptionKey
         let recordName: String = model.recordName
         let relativeFilePath: String? = model.relativeFilePath
-        let uncompressedDataLength: UInt64? = archiveOptionalNSNumber(model.uncompressedDataLength, conversion: { serializationSafeUInt64($0.uint64Value) })
+        let uncompressedDataLength: UInt64? = archiveOptionalNSNumber(model.uncompressedDataLength, conversion: { $0.uint64Value })
 
         return BackupFragmentRecord(id: id, recordType: recordType, uniqueId: uniqueId, attachmentId: attachmentId, downloadFilePath: downloadFilePath, encryptionKey: encryptionKey, recordName: recordName, relativeFilePath: relativeFilePath, uncompressedDataLength: uncompressedDataLength)
     }
diff --git a/SignalServiceKit/src/Util/OWSUserProfile+SDS.swift b/SignalServiceKit/src/Util/OWSUserProfile+SDS.swift
index a38916fde3..12bb508771 100644
--- a/SignalServiceKit/src/Util/OWSUserProfile+SDS.swift
+++ b/SignalServiceKit/src/Util/OWSUserProfile+SDS.swift
@@ -594,7 +594,7 @@ class OWSUserProfileSerializer: SDSSerializer {
         let profileName: String? = model.profileName
         let recipientPhoneNumber: String? = model.recipientPhoneNumber
         let recipientUUID: String? = model.recipientUUID
-        let userProfileSchemaVersion: UInt = serializationSafeUInt(model.userProfileSchemaVersion)
+        let userProfileSchemaVersion: UInt = model.userProfileSchemaVersion
         let username: String? = model.username
 
         return UserProfileRecord(id: id, recordType: recordType, uniqueId: uniqueId, avatarFileName: avatarFileName, avatarUrlPath: avatarUrlPath, profileKey: profileKey, profileName: profileName, recipientPhoneNumber: recipientPhoneNumber, recipientUUID: recipientUUID, userProfileSchemaVersion: userProfileSchemaVersion, username: username)
diff --git a/SignalServiceKit/src/Util/TestModel+SDS.swift b/SignalServiceKit/src/Util/TestModel+SDS.swift
index a6977db504..532df535d5 100644
--- a/SignalServiceKit/src/Util/TestModel+SDS.swift
+++ b/SignalServiceKit/src/Util/TestModel+SDS.swift
@@ -601,9 +601,9 @@ class TestModelSerializer: SDSSerializer {
         let int64Value: Int64 = model.int64Value
         let nsIntegerValue: Int = model.nsIntegerValue
         let nsNumberValueUsingInt64: Int64? = archiveOptionalNSNumber(model.nsNumberValueUsingInt64, conversion: { $0.int64Value })
-        let nsNumberValueUsingUInt64: UInt64? = archiveOptionalNSNumber(model.nsNumberValueUsingUInt64, conversion: { serializationSafeUInt64($0.uint64Value) })
-        let nsuIntegerValue: UInt = serializationSafeUInt(model.nsuIntegerValue)
-        let uint64Value: UInt64 = serializationSafeUInt64(model.uint64Value)
+        let nsNumberValueUsingUInt64: UInt64? = archiveOptionalNSNumber(model.nsNumberValueUsingUInt64, conversion: { $0.uint64Value })
+        let nsuIntegerValue: UInt = model.nsuIntegerValue
+        let uint64Value: UInt64 = model.uint64Value
 
         return TestModelRecord(id: id, recordType: recordType, uniqueId: uniqueId, dateValue: dateValue, doubleValue: doubleValue, floatValue: floatValue, int64Value: int64Value, nsIntegerValue: nsIntegerValue, nsNumberValueUsingInt64: nsNumberValueUsingInt64, nsNumberValueUsingUInt64: nsNumberValueUsingUInt64, nsuIntegerValue: nsuIntegerValue, uint64Value: uint64Value)
     }