diff --git a/scripts/build-release.js b/scripts/build-release.js
index 5810b83ee..aefb03336 100755
--- a/scripts/build-release.js
+++ b/scripts/build-release.js
@@ -115,7 +115,6 @@ function buildDist(buildFolder) {
         },
         electronDownload,
         npmRebuild: false,
-        asarUnpack: 'PortForwardingMacApp.app/**/*',
       },
       projectDir: buildFolder,
       targets,
diff --git a/src/dispatcher/iOSDevice.js b/src/dispatcher/iOSDevice.js
index 1942e73f6..b0b459fdf 100644
--- a/src/dispatcher/iOSDevice.js
+++ b/src/dispatcher/iOSDevice.js
@@ -5,13 +5,11 @@
  * @format
  */
 
-import type {ChildProcess} from 'child_process';
 import type {Store} from '../reducers/index.js';
 import type Logger from '../fb-stubs/Logger.js';
 
 import {promisify} from 'util';
 import child_process from 'child_process';
-const exec = promisify(child_process.exec);
 const execFile = promisify(child_process.execFile);
 import IOSDevice from '../devices/IOSDevice';
 
@@ -24,14 +22,6 @@ type iOSSimulatorDevice = {|
 
 type IOSDeviceMap = {[id: string]: Array<iOSSimulatorDevice>};
 
-// start port forwarding server for real device connections
-const portForwarder: ChildProcess = exec(
-  'PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp -portForward=8088 -multiplexChannelPort=8078',
-);
-window.addEventListener('beforeunload', () => {
-  portForwarder.kill();
-});
-
 function querySimulatorDevices(store: Store): Promise<IOSDeviceMap> {
   const {connections} = store.getState();
 
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/CocoaAsyncSocketMac b/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/CocoaAsyncSocketMac
deleted file mode 100755
index 8917be44d..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/CocoaAsyncSocketMac and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Resources/Info.plist b/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Resources/Info.plist
deleted file mode 100644
index 9e893f549..000000000
--- a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Resources/Info.plist
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>CocoaAsyncSocketMac</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.robbiehanson.CocoaAsyncSocketMac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>CocoaAsyncSocketMac</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/CocoaAsyncSocketMac b/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/CocoaAsyncSocketMac
deleted file mode 100755
index 8917be44d..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/CocoaAsyncSocketMac and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/Resources/Info.plist b/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index 9e893f549..000000000
--- a/static/PortForwardingMacApp.app/Contents/Frameworks/CocoaAsyncSocketMac.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>CocoaAsyncSocketMac</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.robbiehanson.CocoaAsyncSocketMac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>CocoaAsyncSocketMac</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/FBPortForwarding-Mac b/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/FBPortForwarding-Mac
deleted file mode 100755
index 901b31192..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/FBPortForwarding-Mac and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Resources/Info.plist b/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Resources/Info.plist
deleted file mode 100644
index a0e8d7ec9..000000000
--- a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Resources/Info.plist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>FBPortForwarding-Mac</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.facebook.FBPortForwarding-Mac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>FBPortForwarding-Mac</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2014 Facebook. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/FBPortForwarding-Mac b/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/FBPortForwarding-Mac
deleted file mode 100755
index 901b31192..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/FBPortForwarding-Mac and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/Resources/Info.plist b/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index a0e8d7ec9..000000000
--- a/static/PortForwardingMacApp.app/Contents/Frameworks/FBPortForwarding-Mac.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>FBPortForwarding-Mac</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.facebook.FBPortForwarding-Mac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>FBPortForwarding-Mac</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2014 Facebook. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Resources/Info.plist b/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Resources/Info.plist
deleted file mode 100644
index f66988b1e..000000000
--- a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Resources/Info.plist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>peertalkMac</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.facebook.peertalkMac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>peertalkMac</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2014 Facebook. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/Resources/Info.plist b/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index f66988b1e..000000000
--- a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>peertalkMac</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.facebook.peertalkMac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>peertalkMac</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2014 Facebook. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/peertalkMac b/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/peertalkMac
deleted file mode 100755
index 291ebf9aa..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/Versions/A/peertalkMac and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/peertalkMac b/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/peertalkMac
deleted file mode 100755
index 291ebf9aa..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/Frameworks/peertalkMac.framework/peertalkMac and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/Info.plist b/static/PortForwardingMacApp.app/Contents/Info.plist
deleted file mode 100644
index 5a3dc25fd..000000000
--- a/static/PortForwardingMacApp.app/Contents/Info.plist
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>PortForwardingMacApp</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.facebook.PortForwardingMacApp</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>PortForwardingMacApp</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9A235</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17A360</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0900</string>
-	<key>DTXcodeBuild</key>
-	<string>9A235</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.10</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2013-present Facebook. All rights reserved.</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
diff --git a/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp b/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp
deleted file mode 100755
index 8b1ee87b2..000000000
Binary files a/static/PortForwardingMacApp.app/Contents/MacOS/PortForwardingMacApp and /dev/null differ
diff --git a/static/PortForwardingMacApp.app/Contents/PkgInfo b/static/PortForwardingMacApp.app/Contents/PkgInfo
deleted file mode 100644
index bd04210fb..000000000
--- a/static/PortForwardingMacApp.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file