diff --git a/iOS/FlipperKit/FlipperClient.mm b/iOS/FlipperKit/FlipperClient.mm
index c28e095c3..f25f60272 100644
--- a/iOS/FlipperKit/FlipperClient.mm
+++ b/iOS/FlipperKit/FlipperClient.mm
@@ -10,7 +10,6 @@
 #import "FlipperClient.h"
 #import <Flipper/FlipperCertificateProvider.h>
 #import <Flipper/FlipperClient.h>
-#import <UIKit/UIKit.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
 #include <memory>
@@ -19,9 +18,13 @@
 #import "FlipperKitCertificateProvider.h"
 #import "SKEnvironmentVariables.h"
 #include "SKStateUpdateCPPWrapper.h"
+
+#if !TARGET_OS_OSX
+#import <UIKit/UIKit.h>
 #if !TARGET_OS_SIMULATOR
 #import <FKPortForwarding/FKPortForwardingServer.h>
 #endif
+#endif
 
 using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
 
@@ -30,7 +33,7 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
   folly::ScopedEventBaseThread sonarThread;
   folly::ScopedEventBaseThread connectionThread;
   id<FlipperKitCertificateProvider> _certProvider;
-#if !TARGET_OS_SIMULATOR
+#if !TARGET_OS_OSX && !TARGET_OS_SIMULATOR
   FKPortForwardingServer* _secureServer;
   FKPortForwardingServer* _insecureServer;
 #endif
@@ -51,8 +54,6 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
 }
 - (instancetype)init {
   if (self = [super init]) {
-    UIDevice* device = [UIDevice currentDevice];
-    NSString* deviceName = [device name];
     NSBundle* bundle = [NSBundle mainBundle];
     NSString* appName =
         [bundle objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey];
@@ -68,18 +69,27 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
       return nil;
     }
 
+    NSString* deviceOS;
+    NSString* deviceName;
+#if !TARGET_OS_OSX
+    deviceOS = @"iOS";
+    deviceName = [[UIDevice currentDevice] name];
 #if TARGET_OS_SIMULATOR
     deviceName = [NSString stringWithFormat:@"%@ %@",
                                             [[UIDevice currentDevice] model],
                                             @"Simulator"];
 #endif
+#else
+    deviceOS = @"MacOS";
+    deviceName = [[NSHost currentHost] localizedName];
+#endif
 
     static const std::string UNKNOWN = std::string("unknown");
     try {
       facebook::flipper::FlipperClient::init(
           {{
                "localhost",
-               "iOS",
+               [deviceOS UTF8String],
                [deviceName UTF8String],
                UNKNOWN,
                [appName UTF8String] ?: UNKNOWN,
@@ -133,7 +143,7 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
 }
 
 - (void)start {
-#if !TARGET_OS_SIMULATOR
+#if !TARGET_OS_OSX && !TARGET_OS_SIMULATOR
   _secureServer = [FKPortForwardingServer new];
   [_secureServer forwardConnectionsFromPort:8088];
   [_secureServer listenForMultiplexingChannelOnPort:8078];
@@ -146,7 +156,7 @@ using WrapperPlugin = facebook::flipper::FlipperCppWrapperPlugin;
 
 - (void)stop {
   _cppClient->stop();
-#if !TARGET_OS_SIMULATOR
+#if !TARGET_OS_OSX && !TARGET_OS_SIMULATOR
   [_secureServer close];
   _secureServer = nil;
   [_insecureServer close];
diff --git a/iOS/FlipperKit/FlipperDiagnosticsViewController.h b/iOS/FlipperKit/FlipperDiagnosticsViewController.h
index 176ca8a86..16ac60164 100644
--- a/iOS/FlipperKit/FlipperDiagnosticsViewController.h
+++ b/iOS/FlipperKit/FlipperDiagnosticsViewController.h
@@ -6,6 +6,7 @@
  */
 
 #ifdef FB_SONARKIT_ENABLED
+#if !TARGET_OS_OSX
 
 #import <UIKit/UIKit.h>
 #include "FlipperStateUpdateListener.h"
@@ -26,3 +27,4 @@
 @end
 
 #endif
+#endif
diff --git a/iOS/FlipperKit/FlipperDiagnosticsViewController.m b/iOS/FlipperKit/FlipperDiagnosticsViewController.m
index ed3689069..d076b7225 100644
--- a/iOS/FlipperKit/FlipperDiagnosticsViewController.m
+++ b/iOS/FlipperKit/FlipperDiagnosticsViewController.m
@@ -6,6 +6,7 @@
  */
 
 #ifdef FB_SONARKIT_ENABLED
+#if !TARGET_OS_OSX
 
 #import "FlipperDiagnosticsViewController.h"
 #import "FlipperClient.h"
@@ -126,3 +127,4 @@ static NSString* const kSKCellIdentifier =
 @end
 
 #endif
+#endif
diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h
index 893a03bcf..c8ef70d6f 100755
--- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h
+++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkTransaction.h
@@ -7,8 +7,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "UIKit/UIKit.h"
-
 typedef NS_ENUM(NSInteger, FLEXNetworkTransactionState) {
   FLEXNetworkTransactionStateUnstarted,
   FLEXNetworkTransactionStateAwaitingResponse,
@@ -33,10 +31,6 @@ typedef NS_ENUM(NSInteger, FLEXNetworkTransactionState) {
 
 @property(nonatomic, assign) int64_t receivedDataLength;
 
-/// Only applicable for image downloads. A small thumbnail to preview the full
-/// response.
-@property(nonatomic, strong) UIImage* responseThumbnail;
-
 /// Populated lazily. Handles both normal HTTPBody data and HTTPBodyStreams.
 @property(nonatomic, strong, readonly) NSData* cachedRequestBody;
 
diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h
index 249f3e981..318d34de9 100755
--- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h
+++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXUtility.h
@@ -10,13 +10,6 @@
 #import <objc/runtime.h>
 
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#define FLEXFloor(x) \
-  (floor([[UIScreen mainScreen] scale] * (x)) / [[UIScreen mainScreen] scale])
-
-#define FLEX_AT_LEAST_IOS11_SDK \
-  defined(__IPHONE_11_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0)
 
 @interface NSNumber (SonarUtility)