diff --git a/WordPress/Classes/Categories/Media+Extensions.m b/WordPress/Classes/Categories/Media+Extensions.m
index 5a57d783983a..a6ae9f9cd022 100644
--- a/WordPress/Classes/Categories/Media+Extensions.m
+++ b/WordPress/Classes/Categories/Media+Extensions.m
@@ -2,12 +2,7 @@
 #import "MediaService.h"
 @import WordPressData;
 @import WordPressShared;
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @implementation Media (Extensions)
 
 - (NSError *)errorWithMessage:(NSString *)errorMessage {
diff --git a/WordPress/Classes/Services/AccountService.h b/WordPress/Classes/Services/AccountService.h
index cda2e1efc4ea..37981c797e56 100644
--- a/WordPress/Classes/Services/AccountService.h
+++ b/WordPress/Classes/Services/AccountService.h
@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
 #import <CoreData/CoreData.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class WPAccount;
 @class RemoteUser;
+@protocol CoreDataStack;
 
 extern NSNotificationName const WPAccountEmailAndDefaultBlogUpdatedNotification;
 
diff --git a/WordPress/Classes/Services/AccountService.m b/WordPress/Classes/Services/AccountService.m
index 748b4b67d280..28ae9ec2bfc6 100644
--- a/WordPress/Classes/Services/AccountService.m
+++ b/WordPress/Classes/Services/AccountService.m
@@ -5,12 +5,7 @@
 @import WordPressKit;
 @import WordPressShared;
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 NSString * const WPAccountEmailAndDefaultBlogUpdatedNotification = @"WPAccountEmailAndDefaultBlogUpdatedNotification";
 
 @implementation AccountService
diff --git a/WordPress/Classes/Services/BlogService.h b/WordPress/Classes/Services/BlogService.h
index d2ae04c440ca..2055fe5e1a00 100644
--- a/WordPress/Classes/Services/BlogService.h
+++ b/WordPress/Classes/Services/BlogService.h
@@ -1,5 +1,4 @@
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -7,8 +6,10 @@ extern NSString *const WordPressMinimumVersion;
 extern NSString *const WPBlogUpdatedNotification;
 extern NSString *const WPBlogSettingsUpdatedNotification;
 
+@class Blog;
 @class WPAccount;
 @class SiteInfo;
+@protocol CoreDataStack;
 
 @interface BlogService : NSObject
 
diff --git a/WordPress/Classes/Services/BlogService.m b/WordPress/Classes/Services/BlogService.m
index 0b98e93a476e..5c392ed787a6 100644
--- a/WordPress/Classes/Services/BlogService.m
+++ b/WordPress/Classes/Services/BlogService.m
@@ -3,11 +3,7 @@
 #import "WPError.h"
 #import "PostCategoryService.h"
 #import "CommentService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 @import WordPressShared;
diff --git a/WordPress/Classes/Services/CommentService.h b/WordPress/Classes/Services/CommentService.h
index 64345e59368a..2aeab7c4534d 100644
--- a/WordPress/Classes/Services/CommentService.h
+++ b/WordPress/Classes/Services/CommentService.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
 #import <WordPressKit/WordPressKit.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -12,6 +11,7 @@ extern NSUInteger const WPTopLevelHierarchicalCommentsPerPage;
 @class BasePost;
 @class RemoteUser;
 @class CommentServiceRemoteFactory;
+@protocol CoreDataStack;
 
 @interface CommentService : NSObject
 
diff --git a/WordPress/Classes/Services/CommentService.m b/WordPress/Classes/Services/CommentService.m
index f4499ba419ea..59034f0f0d7a 100644
--- a/WordPress/Classes/Services/CommentService.m
+++ b/WordPress/Classes/Services/CommentService.m
@@ -1,10 +1,6 @@
 #import "CommentService.h"
 #import "AccountService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import WordPressShared;
diff --git a/WordPress/Classes/Services/Facades/BlogSyncFacade.m b/WordPress/Classes/Services/Facades/BlogSyncFacade.m
index 9740684c5b8e..9d1a5a29cd8c 100644
--- a/WordPress/Classes/Services/Facades/BlogSyncFacade.m
+++ b/WordPress/Classes/Services/Facades/BlogSyncFacade.m
@@ -2,14 +2,8 @@
 #import "BlogService.h"
 #import "AccountService.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-// For some reason, the modular import does not work.
-// @import WordPressData;
-#import <WordPressData/WordPressData.h>
+@import WordPressData;
 
 @import WordPressShared;
 @import NSObject_SafeExpectations;
diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h
index 40a52d6b705f..48eb7ffe4842 100644
--- a/WordPress/Classes/Services/MediaService.h
+++ b/WordPress/Classes/Services/MediaService.h
@@ -4,8 +4,6 @@
 
 @class Media;
 @class RemoteVideoPressVideo;
-@class Blog;
-@class AbstractPost;
 @protocol ExportableAsset;
 
 extern NSErrorDomain _Nonnull const MediaServiceErrorDomain;
diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m
index c5acafed2131..398ff38c3e9c 100644
--- a/WordPress/Classes/Services/MediaService.m
+++ b/WordPress/Classes/Services/MediaService.m
@@ -1,11 +1,6 @@
 #import "MediaService.h"
 #import <MobileCoreServices/MobileCoreServices.h>
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressKit;
 @import WordPressUI;
diff --git a/WordPress/Classes/Services/MenusService.h b/WordPress/Classes/Services/MenusService.h
index 11aa35b58a0e..0fe7400f7dbd 100644
--- a/WordPress/Classes/Services/MenusService.h
+++ b/WordPress/Classes/Services/MenusService.h
@@ -3,11 +3,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class Blog;
-@class Menu;
-@class MenuLocation;
-@class MenuItem;
-
 typedef void(^MenusServiceSuccessBlock)(void);
 typedef void(^MenusServiceCreateOrUpdateMenuRequestSuccessBlock)(void);
 typedef void(^MenusServiceMenusRequestSuccessBlock)(NSArray<Menu *> * _Nullable menus);
diff --git a/WordPress/Classes/Services/MenusService.m b/WordPress/Classes/Services/MenusService.m
index 850095e21189..dfb98087c4f7 100644
--- a/WordPress/Classes/Services/MenusService.m
+++ b/WordPress/Classes/Services/MenusService.m
@@ -1,9 +1,5 @@
 #import "MenusService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Services/PostCategoryService.h b/WordPress/Classes/Services/PostCategoryService.h
index 587f9337a0f1..d07b1d3381a3 100644
--- a/WordPress/Classes/Services/PostCategoryService.h
+++ b/WordPress/Classes/Services/PostCategoryService.h
@@ -1,10 +1,11 @@
+@import CoreData;
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class Blog;
 @class PostCategory;
+@protocol CoreDataStack;
 
 typedef NS_ENUM(NSInteger, PostCategoryServiceErrors) {
     PostCategoryServiceErrorsBlogNotFound
diff --git a/WordPress/Classes/Services/PostCategoryService.m b/WordPress/Classes/Services/PostCategoryService.m
index 1a21f540ba24..f6e00fee4916 100644
--- a/WordPress/Classes/Services/PostCategoryService.m
+++ b/WordPress/Classes/Services/PostCategoryService.m
@@ -1,9 +1,5 @@
 #import "PostCategoryService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Services/PostTagService.h b/WordPress/Classes/Services/PostTagService.h
index 62ee124f7043..a11baed11aea 100644
--- a/WordPress/Classes/Services/PostTagService.h
+++ b/WordPress/Classes/Services/PostTagService.h
@@ -2,9 +2,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class Blog;
-@class PostTag;
-
 @interface PostTagService : LocalCoreDataService
 
 /**
diff --git a/WordPress/Classes/Services/PostTagService.m b/WordPress/Classes/Services/PostTagService.m
index 57c19faef17c..bb4ad6fd133e 100644
--- a/WordPress/Classes/Services/PostTagService.m
+++ b/WordPress/Classes/Services/PostTagService.m
@@ -1,9 +1,5 @@
 #import "PostTagService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.h b/WordPress/Classes/Services/Reader Post/ReaderPostService.h
index 57715268f36e..29dea672746b 100644
--- a/WordPress/Classes/Services/Reader Post/ReaderPostService.h	
+++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.h	
@@ -1,5 +1,5 @@
+@import CoreData;
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnullability-completeness"
@@ -7,6 +7,7 @@
 @class ReaderPost;
 @class ReaderAbstractTopic;
 @class WordPressComRestApi;
+@protocol CoreDataStack;
 
 extern NSString * const ReaderPostServiceErrorDomain;
 extern NSString * const ReaderPostServiceToggleSiteFollowingState;
diff --git a/WordPress/Classes/Services/Reader Post/ReaderPostService.m b/WordPress/Classes/Services/Reader Post/ReaderPostService.m
index 66cf3aa6958c..5a03f7137129 100644
--- a/WordPress/Classes/Services/Reader Post/ReaderPostService.m	
+++ b/WordPress/Classes/Services/Reader Post/ReaderPostService.m	
@@ -4,12 +4,7 @@
 #import "ReaderGapMarker.h"
 #import "ReaderSiteService.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressKit;
 @import WordPressShared;
diff --git a/WordPress/Classes/Services/ReaderSiteService.h b/WordPress/Classes/Services/ReaderSiteService.h
index 80183ff3e22d..2c037914d460 100644
--- a/WordPress/Classes/Services/ReaderSiteService.h
+++ b/WordPress/Classes/Services/ReaderSiteService.h
@@ -1,5 +1,6 @@
 #import <Foundation/Foundation.h>
-@import WordPressData;
+
+@protocol CoreDataStack;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/WordPress/Classes/Services/ReaderSiteService.m b/WordPress/Classes/Services/ReaderSiteService.m
index fb6e391ccfd7..9dcff961693c 100644
--- a/WordPress/Classes/Services/ReaderSiteService.m
+++ b/WordPress/Classes/Services/ReaderSiteService.m
@@ -2,11 +2,7 @@
 
 #import "AccountService.h"
 #import "ReaderPostService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 #import "WPAppAnalytics.h"
 @import WordPressData;
 @import WordPressKit;
diff --git a/WordPress/Classes/Services/ReaderTopicService.h b/WordPress/Classes/Services/ReaderTopicService.h
index 22512bfe2353..be9fc7f78f3f 100644
--- a/WordPress/Classes/Services/ReaderTopicService.h
+++ b/WordPress/Classes/Services/ReaderTopicService.h
@@ -1,5 +1,5 @@
+@import CoreData;
 #import <Foundation/Foundation.h>
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -9,6 +9,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
 @class ReaderTagTopic;
 @class ReaderSiteTopic;
 @class ReaderSearchTopic;
+@protocol CoreDataStack;
 
 @interface ReaderTopicService : NSObject
 
diff --git a/WordPress/Classes/Services/ReaderTopicService.m b/WordPress/Classes/Services/ReaderTopicService.m
index c84c31ded335..7ee3826bf4f5 100644
--- a/WordPress/Classes/Services/ReaderTopicService.m
+++ b/WordPress/Classes/Services/ReaderTopicService.m
@@ -1,11 +1,7 @@
 #import "ReaderTopicService.h"
 #import "AccountService.h"
 #import "ReaderPostService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 @import WordPressShared;
diff --git a/WordPress/Classes/Services/ThemeService.h b/WordPress/Classes/Services/ThemeService.h
index bc2ca6b3be65..065fac4315f6 100644
--- a/WordPress/Classes/Services/ThemeService.h
+++ b/WordPress/Classes/Services/ThemeService.h
@@ -1,10 +1,9 @@
-@import WordPressData;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @class Blog;
 @class Theme;
 @class WPAccount;
+@protocol CoreDataStack;
 
 typedef void(^ThemeServiceSuccessBlock)(void);
 typedef void(^ThemeServiceThemeRequestSuccessBlock)(Theme * _Nullable theme);
diff --git a/WordPress/Classes/Services/ThemeService.m b/WordPress/Classes/Services/ThemeService.m
index 9da61d65e2d6..bd84ed97c64a 100644
--- a/WordPress/Classes/Services/ThemeService.m
+++ b/WordPress/Classes/Services/ThemeService.m
@@ -1,10 +1,6 @@
 #import "ThemeService.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressKit;
 
diff --git a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
index 1d55703b8c91..c0bc86eb8429 100644
--- a/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
+++ b/WordPress/Classes/Utility/Analytics/WPAppAnalytics.m
@@ -3,11 +3,7 @@
 
 #import "WPAppAnalytics.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 NSString * const WPAppAnalyticsDefaultsUserOptedOut                 = @"tracks_opt_out";
diff --git a/WordPress/Classes/Utility/Logging/WPLogger.m b/WordPress/Classes/Utility/Logging/WPLogger.m
index b557b4936971..a0a8e59dc946 100644
--- a/WordPress/Classes/Utility/Logging/WPLogger.m
+++ b/WordPress/Classes/Utility/Logging/WPLogger.m
@@ -2,12 +2,7 @@
 @import WordPressShared;
 
 #import "WPLogger.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 DDLogLevel ddLogLevel = DDLogLevelInfo;
 
 void SetCocoaLumberjackObjCLogLevel(NSUInteger ddLogLevelRawValue)
diff --git a/WordPress/Classes/Utility/UIAlertControllerProxy.m b/WordPress/Classes/Utility/UIAlertControllerProxy.m
index 8ce39a77f091..2c14756eafd5 100644
--- a/WordPress/Classes/Utility/UIAlertControllerProxy.m
+++ b/WordPress/Classes/Utility/UIAlertControllerProxy.m
@@ -1,11 +1,7 @@
 @import WordPressShared;
 
 #import "UIAlertControllerProxy.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressShared;
 
 @implementation UIAlertControllerProxy
diff --git a/WordPress/Classes/Utility/WPError.m b/WordPress/Classes/Utility/WPError.m
index 4b29902336ba..0357fb9e9f39 100644
--- a/WordPress/Classes/Utility/WPError.m
+++ b/WordPress/Classes/Utility/WPError.m
@@ -1,10 +1,5 @@
 #import "WPError.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 @import WordPressKit;
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m
index b72d6de6d315..ab4dc9310c9a 100644
--- a/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m	
+++ b/WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController.m	
@@ -7,11 +7,7 @@
 #import "SharingViewController.h"
 #import "StatsViewController.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 #import "MenusViewController.h"
 
 @import Gridicons;
diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m
index b5e6b04dad0d..5ab711535e79 100644
--- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m
+++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingAuthorizationHelper.m
@@ -3,11 +3,7 @@
 #import "SharingAuthorizationHelper.h"
 #import "BlogService.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
index 09bcc81da68f..de4cbc6d5a4f 100644
--- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
+++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingConnectionsViewController.m
@@ -3,12 +3,7 @@
 #import "BlogService.h"
 #import "SharingDetailViewController.h"
 #import "SharingAuthorizationHelper.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
index 159640dba4a6..9a1027836e59 100644
--- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
+++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingDetailViewController.m
@@ -1,12 +1,7 @@
 #import "SharingDetailViewController.h"
 #import "BlogService.h"
 #import "SharingAuthorizationHelper.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m
index 794b524f8197..33b84148ed3a 100644
--- a/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m
+++ b/WordPress/Classes/ViewRelated/Blog/Sharing/SharingViewController.m
@@ -1,12 +1,7 @@
 #import "SharingViewController.h"
 #import "BlogService.h"
 #import "SharingConnectionsViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressUI;
 @import WordPressShared;
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m
index 72e41f587e05..f1690b993b62 100644
--- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m	
+++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SettingTableViewCell.m	
@@ -1,10 +1,5 @@
 #import "SettingTableViewCell.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 NSString * const SettingsTableViewCellReuseIdentifier = @"org.wordpress.SettingTableViewCell";
 
 @implementation SettingTableViewCell
diff --git a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m
index 463c789dac56..6d232ba83b8d 100644
--- a/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m	
+++ b/WordPress/Classes/ViewRelated/Blog/Site Settings/SiteSettingsViewController.m	
@@ -6,11 +6,7 @@
 #import "SettingsMultiTextViewController.h"
 #import "SettingTableViewCell.h"
 #import "SettingsTextViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 #import "AccountService.h"
 @import WordPressData;
 @import WordPressKit;
diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m
index 37ca6f9e4250..248f471eea0d 100644
--- a/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m
+++ b/WordPress/Classes/ViewRelated/Comments/Controllers/CommentsViewController.m
@@ -1,10 +1,5 @@
 #import "CommentsViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressLegacy;
 @import WordPressShared;
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m
index 64c1086521d4..e963031e4b98 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuDetailsViewController.m
@@ -1,11 +1,7 @@
 #import "MenuDetailsViewController.h"
 #import "Menu+ViewDesign.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m
index d2dd657455b2..36c3ea9db747 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuHeaderViewController.m
@@ -1,11 +1,7 @@
 #import "MenuHeaderViewController.h"
 #import "MenusSelectionView.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m
index ffe300624e21..34bac259ad99 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemCategoriesViewController.m
@@ -1,10 +1,6 @@
 #import "MenuItemCategoriesViewController.h"
 #import "PostCategoryService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 static NSUInteger const CategorySyncLimit = 1000;
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m
index caa5c0dfbc3a..f7a0c30e66d4 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemEditingViewController.m
@@ -3,11 +3,7 @@
 #import "MenuItemEditingFooterView.h"
 #import "MenuItemSourceViewController.h"
 #import "MenuItemTypeViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m
index 27e0c3005d61..de5e5ac68831 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemLinkViewController.m
@@ -1,11 +1,6 @@
 #import "MenuItemLinkViewController.h"
 #import "MenuItemCheckButtonView.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 static CGFloat const LinkTextBarHeight = 48.0;
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m
index b5dc628d65a6..c0779aa35b40 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPagesViewController.m
@@ -1,9 +1,5 @@
 #import "MenuItemPagesViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @interface MenuItemAbstractPostsViewController () <MenuItemSourcePostAbstractViewSubclass>
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m
index 728fde78e062..ed505bf3e865 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemPostsViewController.m
@@ -1,9 +1,5 @@
 #import "MenuItemPostsViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @interface MenuItemAbstractPostsViewController () <MenuItemSourcePostAbstractViewSubclass>
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h
index e59fee59edd5..6b2855e00d6c 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.h
@@ -1,7 +1,7 @@
+@import CoreData;
 #import <UIKit/UIKit.h>
 #import "MenuItemSourceTextBar.h"
 #import "MenuItemSourceCell.h"
-@import WordPressData;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m
index dc8ef8535726..6a7864b1a0e2 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceResultsViewController.m
@@ -2,11 +2,7 @@
 #import "MenuItemSourceTextBar.h"
 #import "MenuItemSourceFooterView.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m
index 856eb36a9c31..8d2c72eb959f 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemSourceViewController.m
@@ -6,6 +6,7 @@
 #import "MenuItemTagsViewController.h"
 #import "MenuItemPostsViewController.h"
 #import "Menu.h"
+@import WordPressData;
 
 static CGFloat const SourceHeaderViewHeight = 60.0;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m
index 415033f95d55..cd68e85e3edc 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemTypeViewController.m
@@ -1,11 +1,7 @@
 #import "MenuItemTypeViewController.h"
 #import "MenuItemTypeSelectionView.h"
 #import "BlogService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @interface MenuItemTypeViewController () <MenuItemTypeViewDelegate>
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m
index ff228ae2978a..433675006c73 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenuItemsViewController.m
@@ -4,12 +4,7 @@
 #import "MenuItemInsertionView.h"
 #import "MenuItemsVisualOrderingView.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m
index 95f3d783e078..0cd818a491c6 100644
--- a/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m
+++ b/WordPress/Classes/ViewRelated/Menus/Controllers/MenusViewController.m
@@ -6,12 +6,7 @@
 #import "MenuItemEditingViewController.h"
 #import "Menu+ViewDesign.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressData;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m
index 234b261a12b7..dd24e7fd7eb3 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemAbstractView.m
@@ -1,11 +1,6 @@
 #import "MenuItemAbstractView.h"
 #import "MenuItem+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressUI;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m
index d00ce9c2f8e2..07e623c9425a 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemCheckButtonView.m
@@ -1,11 +1,6 @@
 #import "MenuItemCheckButtonView.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 @import Gridicons;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m
index 87245dd66144..2c91b956abd3 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingFooterView.m
@@ -1,10 +1,5 @@
 #import "MenuItemEditingFooterView.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import Gridicons;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m
index 57925a11eb67..8fb6a0bfc61e 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemEditingHeaderView.m
@@ -1,10 +1,6 @@
 #import "MenuItemEditingHeaderView.h"
 #import "MenuItem+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import WordPressShared;
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m
index 16c6c616ba0a..9e1ec432ab5e 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemInsertionView.m
@@ -1,10 +1,5 @@
 #import "MenuItemInsertionView.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import Gridicons;
 
 @implementation MenuItemInsertionView
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m
index f28b3cfdb67c..a41827312de5 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceCell.m
@@ -1,11 +1,6 @@
 #import "MenuItemSourceCell.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 #pragma mark - MenuItemSourceRadioButton
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m
index 7be1993927f9..c6dbfc31f6bc 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceFooterView.m
@@ -1,12 +1,7 @@
 #import "MenuItemSourceFooterView.h"
 #import "MenuItemSourceCell.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 @interface MenuItemSourceFooterView ()
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m
index 95cf8ad536fc..e4d123feac48 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceHeaderView.m
@@ -1,11 +1,7 @@
 #import "MenuItemSourceHeaderView.h"
 #import "MenuItem+ViewDesign.h"
 #import "MenuItem.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import WordPressShared;
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m
index cd6053a30820..5f02a9323a79 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemSourceTextBar.m
@@ -1,11 +1,6 @@
 #import "MenuItemSourceTextBar.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import Gridicons;
 @import WordPressShared;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m
index 0014a8ad32b3..c998b3a9d7c4 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemTypeSelectionView.m
@@ -2,11 +2,7 @@
 #import "Menu+ViewDesign.h"
 #import "MenuItem+ViewDesign.h"
 #import "MenuItem.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import WordPressShared;
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m
index 27a991a5a9a8..7ea4bf97e7ea 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenuItemView.m
@@ -1,10 +1,6 @@
 #import "MenuItemView.h"
 #import "MenuItem+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import Gridicons;
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m
index 50ef60d462ef..a28f3ea30dc8 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionDetailView.m
@@ -2,12 +2,7 @@
 #import "Menu+ViewDesign.h"
 #import "MenusSelectionView.h"
 
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 @import Gridicons;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m
index 41bdcd8d9b3c..44c82df9815e 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionItemView.m
@@ -1,12 +1,7 @@
 #import "MenusSelectionItemView.h"
 #import "MenusSelectionView.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 @import Gridicons;
 
diff --git a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m
index f34b331136e0..c4fe6f5c0ad6 100644
--- a/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m
+++ b/WordPress/Classes/ViewRelated/Menus/Views/MenusSelectionView.m
@@ -2,12 +2,7 @@
 #import "MenusSelectionDetailView.h"
 #import "MenusSelectionItemView.h"
 #import "Menu+ViewDesign.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 @interface MenusSelectionView () <MenusSelectionDetailViewDelegate, MenusSelectionItemViewDelegate>
diff --git a/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m b/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m
index 6ed931aa4b93..8734ed14de5f 100644
--- a/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m
+++ b/WordPress/Classes/ViewRelated/Pages/PageSettingsViewController.m
@@ -1,11 +1,6 @@
 #import "PageSettingsViewController.h"
 #import "PostSettingsViewController_Internal.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @interface PageSettingsViewController ()
 
 @end
diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h
index c5f9dda4e7a8..0276c6c0042d 100644
--- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h
+++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.h
@@ -1,6 +1,6 @@
 #import <UIKit/UIKit.h>
-@import WordPressData;
 
+@class AbstractPost;
 // TODO: It can be removed when the new editor is released. It only exists to support the "Featured" badge on featured images in Gutenberg mobile.
 @protocol FeaturedImageDelegate
 
diff --git a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
index d05a01fda26c..1f3881ab0331 100644
--- a/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
+++ b/WordPress/Classes/ViewRelated/Post/PostSettingsViewController.m
@@ -3,11 +3,7 @@
 #import "SettingsSelectionViewController.h"
 #import "SharingDetailViewController.h"
 #import "MediaService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 @import WordPressData;
 
 @import Gridicons;
diff --git a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m
index 276397a13a0a..eb08c1e020da 100644
--- a/WordPress/Classes/ViewRelated/Stats/StatsViewController.m
+++ b/WordPress/Classes/ViewRelated/Stats/StatsViewController.m
@@ -1,10 +1,6 @@
 #import "StatsViewController.h"
 #import "BlogService.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
 #import "WPAppAnalytics.h"
 
 @import WordPressData;
diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m
index b76f2701cda7..42e21db5d89f 100644
--- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m
+++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableView.m
@@ -1,13 +1,7 @@
 #import "SuggestionsTableView.h"
 #import "SuggestionsTableViewCell.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-// For some reason, the modular import does not work.
-// @import WordPressData;
-#import <WordPressData/WordPressData.h>
+@import WordPressData;
 
 CGFloat const STVDefaultMinHeaderHeight = 0.f;
 NSString * const CellIdentifier = @"SuggestionsTableViewCell";
diff --git a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m
index 3cdf5e8203e9..82bf231cfb71 100644
--- a/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m
+++ b/WordPress/Classes/ViewRelated/Suggestions/SuggestionsTableViewCell.m
@@ -1,10 +1,5 @@
 #import "SuggestionsTableViewCell.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 NSInteger const SuggestionsTableViewCellIconSize = 24;
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.h b/WordPress/Classes/ViewRelated/System/WPTabBarController.h
index 8d73e46e7e7b..43ff43ab5688 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController.h
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.h
@@ -9,14 +9,10 @@ extern NSString * const WPTabBarCurrentlySelectedScreenReader;
 extern NSString * const WPTabBarCurrentlySelectedScreenNotifications;
 extern NSNotificationName const WPTabBarHeightChangedNotification;
 
-@class AbstractPost;
-@class Blog;
-@class BloggingPromptCoordinator;
 @class MeViewController;
 @class MySitesCoordinator;
 @class NotificationsViewController;
 @class ReaderPresenter;
-@protocol ScenePresenter;
 
 @interface WPTabBarController : UITabBarController <UIViewControllerTransitioningDelegate>
 
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
index 4641ca093cb8..1b62b2a1c6b8 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -5,14 +5,8 @@
 
 #import "BlogDetailsViewController.h"
 #import "WPAppAnalytics.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-// For some reason, the modular import does not work.
-// @import WordPressData;
-#import <WordPressData/WordPressData.h>
+@import WordPressData;
 
 @import Gridicons;
 @import WordPressData;
diff --git a/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m b/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m
index 6d3005a0cca2..6d369b3d17f1 100644
--- a/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m
+++ b/WordPress/Classes/ViewRelated/Tools/SettingsMultiTextViewController.m
@@ -1,10 +1,5 @@
 #import "SettingsMultiTextViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 static CGVector const SettingsTextPadding = {11.0f, 3.0f};
diff --git a/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m b/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m
index aa5fae5fe882..39c83c1dbe90 100644
--- a/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m
+++ b/WordPress/Classes/ViewRelated/Tools/SettingsSelectionViewController.m
@@ -1,12 +1,7 @@
 #import "SettingsSelectionViewController.h"
 #import "SettingsTextViewController.h"
 #import "NSDictionary+SafeExpectations.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 NSString * const SettingsSelectionTitleKey = @"Title";
diff --git a/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m b/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m
index b8ecebacd68d..03300c8c798f 100644
--- a/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m
+++ b/WordPress/Classes/ViewRelated/Tools/SettingsTextViewController.m
@@ -1,10 +1,5 @@
 #import "SettingsTextViewController.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 
 #pragma mark - Constants
diff --git a/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m b/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m
index 597dcb39925d..14a146ab3ef3 100644
--- a/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m
+++ b/WordPress/Classes/ViewRelated/Views/WPUploadStatusButton.m
@@ -1,10 +1,5 @@
 #import "WPUploadStatusButton.h"
-#ifdef KEYSTONE
-#import "Keystone-Swift.h"
-#else
 #import "WordPress-Swift.h"
-#endif
-
 @import WordPressShared;
 @import WordPressUI;