diff --git a/iOS/Sample/Dummy.swift b/iOS/Sample/Dummy.swift
deleted file mode 100644
index 3b553ff4d..000000000
--- a/iOS/Sample/Dummy.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import Foundation
-
-// Added this dummy swift file to solve the sample app's compilation issue for Xcode 11.
-// Following are the links with the explanation for this fix.
-// D18420963, D18420963
-// https://github.com/Carthage/Carthage/issues/2825
-// https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21
diff --git a/iOS/Sample/Sample-Bridging-Header.h b/iOS/Sample/Sample-Bridging-Header.h
deleted file mode 100755
index 5caf6516e..000000000
--- a/iOS/Sample/Sample-Bridging-Header.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj
index bd38e8289..1abe82d3d 100644
--- a/iOS/Sample/Sample.xcodeproj/project.pbxproj
+++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		0D0B1CF0E859D91C55CC453B /* libPods-Sample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F97F4E8C3E28D8BFAAEE60F4 /* libPods-Sample.a */; };
 		4E102341216AD7B400160734 /* UserDefaultsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E102340216AD7B400160734 /* UserDefaultsViewController.m */; };
 		53B4A36B217E2B6200B36A53 /* CommunicationDemoViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53B4A36A217E2B6200B36A53 /* CommunicationDemoViewController.mm */; };
-		53B8C8D323788AC600D2D1FD /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B8C8D223788AC600D2D1FD /* Dummy.swift */; };
 		53D59DB320ABA18400207065 /* NetworkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAA20ABA18300207065 /* NetworkViewController.m */; };
 		53D59DB420ABA18400207065 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAB20ABA18300207065 /* AppDelegate.m */; };
 		53D59DB520ABA18400207065 /* MainViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D59DAD20ABA18300207065 /* MainViewController.mm */; };
@@ -26,8 +25,6 @@
 		4E102340216AD7B400160734 /* UserDefaultsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserDefaultsViewController.m; sourceTree = "<group>"; };
 		534252A9217DECCD0092D02B /* CommunicationDemoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommunicationDemoViewController.h; sourceTree = "<group>"; };
 		53B4A36A217E2B6200B36A53 /* CommunicationDemoViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CommunicationDemoViewController.mm; sourceTree = "<group>"; };
-		53B8C8D123788AC500D2D1FD /* Sample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Sample-Bridging-Header.h"; sourceTree = "<group>"; };
-		53B8C8D223788AC600D2D1FD /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		53D59DAA20ABA18300207065 /* NetworkViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkViewController.m; sourceTree = SOURCE_ROOT; };
 		53D59DAB20ABA18300207065 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
 		53D59DAC20ABA18300207065 /* NetworkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkViewController.h; sourceTree = SOURCE_ROOT; };
@@ -83,12 +80,10 @@
 		53E0DE3820ABA0E3005682E1 = {
 			isa = PBXGroup;
 			children = (
-				53B8C8D223788AC600D2D1FD /* Dummy.swift */,
 				53D59DB920ABA19900207065 /* Sample */,
 				53E0DE4220ABA0E3005682E1 /* Products */,
 				56F86505D10A36D42C8D0302 /* Pods */,
 				C89232DD95E032B5B6FA95A1 /* Frameworks */,
-				53B8C8D123788AC500D2D1FD /* Sample-Bridging-Header.h */,
 			);
 			sourceTree = "<group>";
 		};
@@ -211,7 +206,6 @@
 			files = (
 				53E0DE5420ABA0E4005682E1 /* main.m in Sources */,
 				4E102341216AD7B400160734 /* UserDefaultsViewController.m in Sources */,
-				53B8C8D323788AC600D2D1FD /* Dummy.swift in Sources */,
 				53D59DB320ABA18400207065 /* NetworkViewController.m in Sources */,
 				53D59DB420ABA18400207065 /* AppDelegate.m in Sources */,
 				53B4A36B217E2B6200B36A53 /* CommunicationDemoViewController.mm in Sources */,
@@ -363,9 +357,15 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
+					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
+				);
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FlipperKit/FlipperKit.modulemap\"",
@@ -455,9 +455,15 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
+					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
+				);
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-fmodule-map-file=\"${PODS_ROOT}/Headers/Public/FlipperKit/FlipperKit.modulemap\"",