diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m
index ffb2991e3..386a6148a 100644
--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@@ -212,6 +212,8 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
 
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
+    OWSRaiseException(
+        @"OWSStorageExceptionName_SaveToUnknownCollection", @"Tried to save object from unknown collection");
 }
 
 @end
diff --git a/SignalServiceKit/src/Storage/TSRecipient.h b/SignalServiceKit/src/Storage/TSRecipient.h
deleted file mode 100644
index 32febfdd6..000000000
--- a/SignalServiceKit/src/Storage/TSRecipient.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "TSYapDatabaseObject.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-// Some lingering TSRecipient records in the wild causing crashes.
-// This is a stop gap until a proper cleanup happens.
-@interface TSRecipient : TSYapDatabaseObject
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Storage/TSRecipient.m b/SignalServiceKit/src/Storage/TSRecipient.m
deleted file mode 100644
index 00470f401..000000000
--- a/SignalServiceKit/src/Storage/TSRecipient.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "TSRecipient.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation TSRecipient
-
-@end
-
-NS_ASSUME_NONNULL_END