diff --git a/Pods b/Pods
index 02d9e07b52..39c23000fa 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit 02d9e07b52a3c3a43cc29a90c586b61fc30cd032
+Subproject commit 39c23000fa4c377adddcd952b8a8093a14ade407
diff --git a/SignalServiceKit/protobuf/Makefile b/SignalServiceKit/protobuf/Makefile
index 42772b7db3..d7b4c47b7c 100644
--- a/SignalServiceKit/protobuf/Makefile
+++ b/SignalServiceKit/protobuf/Makefile
@@ -1,9 +1,9 @@
 # See README.md in this dir for prerequisite setup.
-	
+
 PROTOC=protoc \
 		--plugin=/usr/local/bin/protoc-gen-objc \
-		--proto_path="${HOME}/code/workspace/ows/protobuf-objc/src/compiler/" \
-		--proto_path="${HOME}/code/workspace/ows/protobuf-objc/src/compiler/google/protobuf/" \
+		--proto_path="${HOME}/src/WhisperSystems/protobuf-objc/src/compiler/" \
+		--proto_path="${HOME}/src/WhisperSystems/protobuf-objc/src/compiler/google/protobuf/" \
 		--proto_path='./'
 
 all: signal_service_proto provisioning_protos fingerprint_protos
diff --git a/SignalServiceKit/src/Storage/OWSBackupStorage.h b/SignalServiceKit/src/Storage/OWSBackupStorage.h
deleted file mode 100644
index babb381714..0000000000
--- a/SignalServiceKit/src/Storage/OWSBackupStorage.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-#import "OWSPrimaryStorage.h"
-#import "OWSStorage.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NSData *_Nullable (^BackupStorageKeySpecBlock)(void);
-
-@interface OWSBackupStorage : OWSStorage
-
-- (instancetype)init NS_UNAVAILABLE;
-
-- (instancetype)initStorage NS_UNAVAILABLE;
-
-- (instancetype)initBackupStorageWithDatabaseDirPath:(NSString *)databaseDirPath
-                                        keySpecBlock:(BackupStorageKeySpecBlock)keySpecBlock NS_DESIGNATED_INITIALIZER;
-
-- (void)runSyncRegistrations;
-- (void)runAsyncRegistrationsWithCompletion:(void (^_Nonnull)(void))completion;
-- (BOOL)areAllRegistrationsComplete;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Storage/OWSBackupStorage.m b/SignalServiceKit/src/Storage/OWSBackupStorage.m
deleted file mode 100644
index 38200e543c..0000000000
--- a/SignalServiceKit/src/Storage/OWSBackupStorage.m
+++ /dev/null
@@ -1,153 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSBackupStorage.h"
-#import "OWSFileSystem.h"
-#import "OWSStorage+Subclass.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface OWSBackupStorage ()
-
-@property (atomic) BOOL areAsyncRegistrationsComplete;
-@property (atomic) BOOL areSyncRegistrationsComplete;
-
-@property (nonatomic, readonly) NSString *databaseDirPath;
-@property (nonatomic, readonly) BackupStorageKeySpecBlock keySpecBlock;
-
-@end
-
-#pragma mark -
-
-@implementation OWSBackupStorage
-
-- (instancetype)initBackupStorageWithDatabaseDirPath:(NSString *)databaseDirPath
-                                        keySpecBlock:(BackupStorageKeySpecBlock)keySpecBlock
-{
-    OWSAssert(databaseDirPath.length > 0);
-    OWSAssert(keySpecBlock);
-    OWSAssert([OWSFileSystem ensureDirectoryExists:databaseDirPath]);
-
-    self = [super initStorage];
-
-    if (self) {
-        _databaseDirPath = databaseDirPath;
-        _keySpecBlock = keySpecBlock;
-
-        [self loadDatabase];
-    }
-
-    return self;
-}
-
-- (void)loadDatabase
-{
-    [super loadDatabase];
-
-    [self protectFiles];
-}
-
-- (void)resetStorage
-{
-    [super resetStorage];
-}
-
-- (void)runSyncRegistrations
-{
-    runSyncRegistrationsForStorage(self);
-
-    // See comments on OWSDatabaseConnection.
-    //
-    // In the absence of finding documentation that can shed light on the issue we've been
-    // seeing, this issue only seems to affect sync and not async registrations.  We've always
-    // been opening write transactions before the async registrations complete without negative
-    // consequences.
-    OWSAssert(!self.areSyncRegistrationsComplete);
-    self.areSyncRegistrationsComplete = YES;
-}
-
-- (void)runAsyncRegistrationsWithCompletion:(void (^_Nonnull)(void))completion
-{
-    OWSAssert(completion);
-
-    runAsyncRegistrationsForStorage(self);
-
-    DDLogVerbose(@"%@ async registrations enqueued.", self.logTag);
-
-    // Block until all async registrations are complete.
-    //
-    // NOTE: This has to happen on the "registration connection" for this
-    //       database.
-    YapDatabaseConnection *dbConnection = self.registrationConnection;
-    OWSAssert(self.registrationConnection);
-    [dbConnection flushTransactionsWithCompletionQueue:dispatch_get_main_queue()
-                                       completionBlock:^{
-                                           OWSAssert(!self.areAsyncRegistrationsComplete);
-
-                                           DDLogVerbose(@"%@ async registrations complete.", self.logTag);
-
-                                           self.areAsyncRegistrationsComplete = YES;
-
-                                           completion();
-                                       }];
-}
-
-- (void)protectFiles
-{
-    [self logFileSizes];
-
-    // Protect the entire new database directory.
-    [OWSFileSystem protectFileOrFolderAtPath:self.databaseDirPath];
-}
-
-+ (NSString *)databaseFilename
-{
-    return @"SignalBackup.sqlite";
-}
-
-- (NSString *)databaseFilename
-{
-    return OWSBackupStorage.databaseFilename;
-}
-
-- (NSString *)databaseFilename_SHM
-{
-    return [self.databaseFilename stringByAppendingString:@"-shm"];
-}
-
-- (NSString *)databaseFilename_WAL
-{
-    return [self.databaseFilename stringByAppendingString:@"-wal"];
-}
-
-- (NSString *)databaseFilePath
-{
-    return [self.databaseDirPath stringByAppendingPathComponent:self.databaseFilename];
-}
-
-- (NSString *)databaseFilePath_SHM
-{
-    return [self.databaseDirPath stringByAppendingPathComponent:self.databaseFilename_SHM];
-}
-
-- (NSString *)databaseFilePath_WAL
-{
-    return [self.databaseDirPath stringByAppendingPathComponent:self.databaseFilename_WAL];
-}
-
-- (NSData *)databaseKeySpec
-{
-    OWSAssert(self.keySpecBlock);
-
-    return self.keySpecBlock();
-}
-
-- (void)ensureDatabaseKeySpecExists
-{
-    // Do nothing.
-}
-
-@end
-
-NS_ASSUME_NONNULL_END