From 0dfdaaa56bcc987ef5cf30a9e5e173cf127fa81d Mon Sep 17 00:00:00 2001
From: Dhiogo Brustolin <dhiogo.brustolin@sentry.io>
Date: Thu, 11 May 2023 11:57:23 +0200
Subject: [PATCH] chore: Remove remaining fishhook code (#3020)

Removed the remaining async stitch code
---
 .../iOS-ObjectiveC/Base.lproj/Main.storyboard |  15 +-
 .../iOS-ObjectiveC/ViewController.m           |  15 -
 .../iOS-Swift/Base.lproj/Main.storyboard      |  10 +-
 .../iOS-Swift/ErrorsViewController.swift      |  19 --
 Sentry.xcodeproj/project.pbxproj              |  16 -
 Sources/Sentry/SentryCrashWrapper.m           |  15 -
 Sources/Sentry/SentryStacktraceBuilder.m      |   1 -
 Sources/Sentry/SentryThreadInspector.m        |   1 -
 Sources/Sentry/include/SentryCrashWrapper.h   |   4 -
 .../SentryCrashMonitor_CPPException.cpp       |   1 -
 .../SentryCrashMonitor_MachException.c        |   1 -
 .../Monitors/SentryCrashMonitor_NSException.m |   1 -
 .../Monitors/SentryCrashMonitor_Signal.c      |   1 -
 .../SentryCrash/Recording/SentryCrashReport.c |   3 -
 .../Tools/SentryCrashMachineContext.c         |   1 -
 .../Recording/Tools/SentryCrashStackCursor.c  |  34 --
 .../Recording/Tools/SentryCrashStackCursor.h  |  16 -
 .../Tools/SentryCrashStackCursor_Backtrace.c  |   7 +-
 .../SentryCrashStackCursor_MachineContext.c   |  10 +-
 .../Tools/SentryCrashStackCursor_SelfThread.c |   2 -
 .../SentryCrash/Recording/Tools/SentryHook.c  | 303 ------------------
 .../SentryCrash/Recording/Tools/SentryHook.h  |  51 ---
 .../SentryCrash/Recording/Tools/fishhook.c    | 268 ----------------
 .../SentryCrash/Recording/Tools/fishhook.h    |  73 -----
 24 files changed, 7 insertions(+), 861 deletions(-)
 delete mode 100644 Sources/SentryCrash/Recording/Tools/SentryHook.c
 delete mode 100644 Sources/SentryCrash/Recording/Tools/SentryHook.h
 delete mode 100644 Sources/SentryCrash/Recording/Tools/fishhook.c
 delete mode 100644 Sources/SentryCrash/Recording/Tools/fishhook.h

diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/Base.lproj/Main.storyboard b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/Base.lproj/Main.storyboard
index f25f62682b3..2c900cc5bf7 100644
--- a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/Base.lproj/Main.storyboard
+++ b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -18,13 +18,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sentry Test App (Objective-C)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Si0-bZ-rNR">
-                                <rect key="frame" x="92" y="88" width="230" height="20.5"/>
+                                <rect key="frame" x="92" y="92" width="230" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="AVC-4r-eVc">
-                                <rect key="frame" x="8" y="116.5" width="398" height="270"/>
+                                <rect key="frame" x="8" y="120.5" width="398" height="240"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rUC-at-hwU">
                                         <rect key="frame" x="0.0" y="0.0" width="398" height="30"/>
@@ -84,13 +84,6 @@
                                             <action selector="oomCrash:" destination="BYZ-38-t0r" eventType="touchUpInside" id="6Eb-uS-ljp"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lr8-6E-lN6">
-                                        <rect key="frame" x="0.0" y="240" width="398" height="30"/>
-                                        <state key="normal" title="async crash"/>
-                                        <connections>
-                                            <action selector="asyncCrash:" destination="BYZ-38-t0r" eventType="touchUpInside" id="c9v-X0-ZOl"/>
-                                        </connections>
-                                    </button>
                                 </subviews>
                             </stackView>
                         </subviews>
diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/ViewController.m b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/ViewController.m
index d2405d68421..05a7f43858e 100644
--- a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/ViewController.m
+++ b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/ViewController.m
@@ -124,21 +124,6 @@ - (IBAction)crash:(id)sender
     [SentrySDK crash];
 }
 
-- (IBAction)asyncCrash:(id)sender
-{
-    dispatch_async(dispatch_get_main_queue(), ^{ [self asyncCrash1]; });
-}
-
-- (void)asyncCrash1
-{
-    dispatch_async(dispatch_get_main_queue(), ^{ [self asyncCrash2]; });
-}
-
-- (void)asyncCrash2
-{
-    dispatch_async(dispatch_get_main_queue(), ^{ [SentrySDK crash]; });
-}
-
 - (IBAction)oomCrash:(id)sender
 {
     dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
index bd6545e8ca9..83e7383e9f7 100644
--- a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
+++ b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
@@ -364,21 +364,13 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s6w-E3-5yE" userLabel="DiskWriteException">
-                                                <rect key="frame" x="0.0" y="28" width="135" height="28"/>
+                                                <rect key="frame" x="0.0" y="42" width="135" height="28"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                 <state key="normal" title="DiskWriteException"/>
                                                 <connections>
                                                     <action selector="diskWriteException:" destination="QmU-DD-itF" eventType="touchUpInside" id="p74-qC-kH7"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cki-iy-1lL">
-                                                <rect key="frame" x="0.0" y="56" width="135" height="28"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                                <state key="normal" title="async crash"/>
-                                                <connections>
-                                                    <action selector="asyncCrash:" destination="QmU-DD-itF" eventType="touchUpInside" id="L4F-Xr-S2F"/>
-                                                </connections>
-                                            </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NNd-Ec-zXw">
                                                 <rect key="frame" x="0.0" y="84" width="135" height="28"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
diff --git a/Samples/iOS-Swift/iOS-Swift/ErrorsViewController.swift b/Samples/iOS-Swift/iOS-Swift/ErrorsViewController.swift
index 33d04789fcd..78b85d1b9de 100644
--- a/Samples/iOS-Swift/iOS-Swift/ErrorsViewController.swift
+++ b/Samples/iOS-Swift/iOS-Swift/ErrorsViewController.swift
@@ -33,13 +33,6 @@ class ErrorsViewController: UIViewController {
     }
     // swiftlint:enable force_unwrapping
 
-    @IBAction func asyncCrash(_ sender: UIButton) {
-        highlightButton(sender)
-        DispatchQueue.main.async {
-            self.asyncCrash1()
-        }
-    }
-
     @IBAction func captureError(_ sender: UIButton) {
         highlightButton(sender)
         do {
@@ -68,18 +61,6 @@ class ErrorsViewController: UIViewController {
         fatalError("This is a fatal error. Oh no 😬.")
     }
 
-    func asyncCrash1() {
-        DispatchQueue.main.async {
-            self.asyncCrash2()
-        }
-    }
-
-    func asyncCrash2() {
-        DispatchQueue.main.async {
-            SentrySDK.crash()
-        }
-    }
-
     @IBAction func oomCrash(_ sender: UIButton) {
         highlightButton(sender)
         DispatchQueue.main.async {
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
index e13ccb54268..b1e12416145 100644
--- a/Sentry.xcodeproj/project.pbxproj
+++ b/Sentry.xcodeproj/project.pbxproj
@@ -714,10 +714,6 @@
 		9286059729A5098900F96038 /* SentryGeo.m in Sources */ = {isa = PBXBuildFile; fileRef = 9286059629A5098900F96038 /* SentryGeo.m */; };
 		9286059929A50BAB00F96038 /* SentryGeoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9286059829A50BAA00F96038 /* SentryGeoTests.swift */; };
 		92F6726B29C8B7B100BFD34D /* SentryUser+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 92F6726A29C8B7B000BFD34D /* SentryUser+Private.h */; };
-		A2475E1325FB63A3007D9080 /* fishhook.h in Headers */ = {isa = PBXBuildFile; fileRef = A2475E1225FB63A3007D9080 /* fishhook.h */; };
-		A2475E1725FB63AF007D9080 /* SentryHook.h in Headers */ = {isa = PBXBuildFile; fileRef = A2475E1625FB63AF007D9080 /* SentryHook.h */; };
-		A2475E1B25FB63D7007D9080 /* SentryHook.c in Sources */ = {isa = PBXBuildFile; fileRef = A2475E1A25FB63D7007D9080 /* SentryHook.c */; };
-		A2475E1F25FB648B007D9080 /* fishhook.c in Sources */ = {isa = PBXBuildFile; fileRef = A2475E1E25FB648B007D9080 /* fishhook.c */; };
 		A811D867248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A811D866248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift */; };
 		A839D89824864B80003B7AFD /* SentrySystemEventBreadcrumbs.h in Headers */ = {isa = PBXBuildFile; fileRef = A839D89724864B80003B7AFD /* SentrySystemEventBreadcrumbs.h */; };
 		A839D89A24864BA8003B7AFD /* SentrySystemEventBreadcrumbs.m in Sources */ = {isa = PBXBuildFile; fileRef = A839D89924864BA8003B7AFD /* SentrySystemEventBreadcrumbs.m */; };
@@ -1639,10 +1635,6 @@
 		9286059629A5098900F96038 /* SentryGeo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryGeo.m; sourceTree = "<group>"; };
 		9286059829A50BAA00F96038 /* SentryGeoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SentryGeoTests.swift; sourceTree = "<group>"; };
 		92F6726A29C8B7B000BFD34D /* SentryUser+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SentryUser+Private.h"; path = "include/HybridPublic/SentryUser+Private.h"; sourceTree = "<group>"; };
-		A2475E1225FB63A3007D9080 /* fishhook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fishhook.h; sourceTree = "<group>"; };
-		A2475E1625FB63AF007D9080 /* SentryHook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SentryHook.h; sourceTree = "<group>"; };
-		A2475E1A25FB63D7007D9080 /* SentryHook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SentryHook.c; sourceTree = "<group>"; };
-		A2475E1E25FB648B007D9080 /* fishhook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fishhook.c; sourceTree = "<group>"; };
 		A811D866248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySystemEventBreadcrumbsTest.swift; sourceTree = "<group>"; };
 		A839D89724864B80003B7AFD /* SentrySystemEventBreadcrumbs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySystemEventBreadcrumbs.h; path = include/SentrySystemEventBreadcrumbs.h; sourceTree = "<group>"; };
 		A839D89924864BA8003B7AFD /* SentrySystemEventBreadcrumbs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySystemEventBreadcrumbs.m; sourceTree = "<group>"; };
@@ -2397,8 +2389,6 @@
 		63FE700520DA4C1000CDBAE8 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
-				A2475E1E25FB648B007D9080 /* fishhook.c */,
-				A2475E1225FB63A3007D9080 /* fishhook.h */,
 				63FE702E20DA4C1000CDBAE8 /* NSError+SentrySimpleConstructor.h */,
 				63FE700E20DA4C1000CDBAE8 /* NSError+SentrySimpleConstructor.m */,
 				63FE703E20DA4C1000CDBAE8 /* SentryCrashCPU_Apple.h */,
@@ -2454,8 +2444,6 @@
 				63FE703220DA4C1000CDBAE8 /* SentryCrashThread.h */,
 				7B883F48253D714C00879E62 /* SentryCrashUUIDConversion.c */,
 				71F11CDEF5952DF5CC69AC74 /* SentryCrashUUIDConversion.h */,
-				A2475E1A25FB63D7007D9080 /* SentryHook.c */,
-				A2475E1625FB63AF007D9080 /* SentryHook.h */,
 				7B31C290277B04A000337126 /* SentryCrashPlatformSpecificDefines.h */,
 			);
 			path = Tools;
@@ -3526,7 +3514,6 @@
 				63FE70EB20DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.h in Headers */,
 				7BC8522F24581096005A70F0 /* SentryFileContents.h in Headers */,
 				7B30B67C26527886006B2752 /* SentryDisplayLinkWrapper.h in Headers */,
-				A2475E1325FB63A3007D9080 /* fishhook.h in Headers */,
 				7BD86ECF264A7C77005439DB /* SentryAppStartMeasurement.h in Headers */,
 				7DC8310A2398283C0043DD9A /* SentryCrashIntegration.h in Headers */,
 				63FE718320DA4C1100CDBAE8 /* SentryCrashReportFixer.h in Headers */,
@@ -3630,7 +3617,6 @@
 				6344DDB91EC3115C00D9160D /* SentryCrashReportConverter.h in Headers */,
 				0A2D8D9828997887008720F6 /* NSLocale+Sentry.h in Headers */,
 				71F116E8F40D530BB68A2987 /* SentryCrashUUIDConversion.h in Headers */,
-				A2475E1725FB63AF007D9080 /* SentryHook.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3888,7 +3874,6 @@
 				7B7A599726B692F00060A676 /* SentryScreenFrames.m in Sources */,
 				7B3398652459C15200BD9C96 /* SentryEnvelopeRateLimit.m in Sources */,
 				0A2D8D9628997845008720F6 /* NSLocale+Sentry.m in Sources */,
-				A2475E1F25FB648B007D9080 /* fishhook.c in Sources */,
 				7B0DC730288698F70039995F /* NSMutableDictionary+Sentry.m in Sources */,
 				7BD4BD4527EB29F50071F4FF /* SentryClientReport.m in Sources */,
 				631E6D341EBC679C00712345 /* SentryQueueableRequestManager.m in Sources */,
@@ -3977,7 +3962,6 @@
 				63FE716720DA4C1100CDBAE8 /* SentryCrashCPU.c in Sources */,
 				63FE717320DA4C1100CDBAE8 /* SentryCrashC.c in Sources */,
 				63FE712120DA4C1000CDBAE8 /* SentryCrashSymbolicator.c in Sources */,
-				A2475E1B25FB63D7007D9080 /* SentryHook.c in Sources */,
 				63FE70D720DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.c in Sources */,
 				7B96572226830D2400C66E25 /* SentryScopeSyncC.c in Sources */,
 				0A9BF4E228A114940068D266 /* SentryViewHierarchyIntegration.m in Sources */,
diff --git a/Sources/Sentry/SentryCrashWrapper.m b/Sources/Sentry/SentryCrashWrapper.m
index d7ae6c29722..3616052fc6d 100644
--- a/Sources/Sentry/SentryCrashWrapper.m
+++ b/Sources/Sentry/SentryCrashWrapper.m
@@ -2,7 +2,6 @@
 #import "SentryCrash.h"
 #import "SentryCrashMonitor_AppState.h"
 #import "SentryCrashMonitor_System.h"
-#import "SentryHook.h"
 #import <Foundation/Foundation.h>
 #import <SentryCrashCachedData.h>
 #import <SentryCrashDebug.h>
@@ -51,20 +50,6 @@ - (BOOL)isApplicationInForeground
     return sentrycrashstate_currentState()->applicationIsInForeground;
 }
 
-- (void)installAsyncHooks
-{
-    NSAssert(false,
-        @"`installAsyncHooks` should not be called, as its behavior is unpredictable and sometimes "
-        @"resulted in unexpected errors.");
-    sentrycrash_install_async_hooks();
-}
-
-- (void)uninstallAsyncHooks
-{
-    NSAssert(false, @"`uninstallAsyncHooks` should not be called");
-    sentrycrash_deactivate_async_hooks();
-}
-
 - (NSDictionary *)systemInfo
 {
     static NSDictionary *sharedInfo = nil;
diff --git a/Sources/Sentry/SentryStacktraceBuilder.m b/Sources/Sentry/SentryStacktraceBuilder.m
index bac08039954..1cba75fe02d 100644
--- a/Sources/Sentry/SentryStacktraceBuilder.m
+++ b/Sources/Sentry/SentryStacktraceBuilder.m
@@ -45,7 +45,6 @@ - (SentryStacktrace *)retrieveStacktraceFromCursor:(SentryCrashStackCursor)stack
             [frames addObject:frame];
         }
     }
-    sentrycrash_async_backtrace_decref(stackCursor.async_caller);
 
     NSArray<SentryFrame *> *framesCleared = [SentryFrameRemover removeNonSdkFrames:frames];
 
diff --git a/Sources/Sentry/SentryThreadInspector.m b/Sources/Sentry/SentryThreadInspector.m
index 8e1b66dc235..67e3d40870b 100644
--- a/Sources/Sentry/SentryThreadInspector.m
+++ b/Sources/Sentry/SentryThreadInspector.m
@@ -46,7 +46,6 @@
             entries++;
         }
     }
-    sentrycrash_async_backtrace_decref(stackCursor.async_caller);
 
     return entries;
 }
diff --git a/Sources/Sentry/include/SentryCrashWrapper.h b/Sources/Sentry/include/SentryCrashWrapper.h
index 86092e1c9de..5f458589591 100644
--- a/Sources/Sentry/include/SentryCrashWrapper.h
+++ b/Sources/Sentry/include/SentryCrashWrapper.h
@@ -23,10 +23,6 @@ SENTRY_NO_INIT
 
 - (BOOL)isApplicationInForeground;
 
-- (void)installAsyncHooks;
-
-- (void)uninstallAsyncHooks;
-
 - (NSDictionary *)systemInfo;
 
 - (bytes)freeMemorySize;
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_CPPException.cpp b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_CPPException.cpp
index e7d13d427ce..784289a8622 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_CPPException.cpp
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_CPPException.cpp
@@ -81,7 +81,6 @@ void
 __cxa_throw(void *thrown_exception, std::type_info *tinfo, void (*dest)(void *))
 {
     if (g_captureNextStackTrace) {
-        sentrycrash_async_backtrace_decref(g_stackCursor.async_caller);
         sentrycrashsc_initSelfThread(&g_stackCursor, 1);
     }
 
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c
index 6176dd84a9d..d5c7d40af70 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c
@@ -390,7 +390,6 @@ handleExceptions(void *const userData)
         SentryCrashLOG_DEBUG("Crash handling complete. Restoring original handlers.");
         g_isHandlingCrash = false;
         sentrycrashmc_resumeEnvironment(threads, numThreads);
-        sentrycrash_async_backtrace_decref(g_stackCursor.async_caller);
     }
 
     SentryCrashLOG_DEBUG("Replying to mach exception message.");
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m
index 4d1a658c796..7da86622775 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_NSException.m
@@ -104,7 +104,6 @@
             SentryCrashLOG_DEBUG(@"Calling original exception handler.");
             g_previousUncaughtExceptionHandler(exception);
         }
-        sentrycrash_async_backtrace_decref(cursor.async_caller);
     }
 }
 
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_Signal.c b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_Signal.c
index a73c73668cd..f5e3714cb0e 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_Signal.c
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_Signal.c
@@ -108,7 +108,6 @@ handleSignal(int sigNum, siginfo_t *signalInfo, void *userContext)
 
         sentrycrashcm_handleException(crashContext);
         sentrycrashmc_resumeEnvironment(threads, numThreads);
-        sentrycrash_async_backtrace_decref(g_stackCursor.async_caller);
     }
 
     SentryCrashLOG_DEBUG("Re-raising signal for regular handlers to catch.");
diff --git a/Sources/SentryCrash/Recording/SentryCrashReport.c b/Sources/SentryCrash/Recording/SentryCrashReport.c
index 07500c2fcaa..89e97d15fae 100644
--- a/Sources/SentryCrash/Recording/SentryCrashReport.c
+++ b/Sources/SentryCrash/Recording/SentryCrashReport.c
@@ -1079,7 +1079,6 @@ writeThread(const SentryCrashReportWriter *const writer, const char *const key,
         "Writing thread %x (index %d). is crashed: %d", thread, threadIndex, isCrashedThread);
 
     SentryCrashStackCursor stackCursor;
-    stackCursor.async_caller = NULL;
 
     bool hasBacktrace = getStackCursor(crash, machineContext, &stackCursor);
 
@@ -1112,8 +1111,6 @@ writeThread(const SentryCrashReportWriter *const writer, const char *const key,
         }
     }
     writer->endContainer(writer);
-
-    sentrycrash_async_backtrace_decref(stackCursor.async_caller);
 }
 
 /** Write information about all threads to the report.
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
index 7fb4063bf5f..b54091fad6d 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
@@ -54,7 +54,6 @@ isStackOverflow(const SentryCrashMachineContext *const context)
         &stackCursor, SentryCrashSC_STACK_OVERFLOW_THRESHOLD, context);
     while (stackCursor.advanceCursor(&stackCursor)) { }
     bool rv = stackCursor.state.hasGivenUp;
-    sentrycrash_async_backtrace_decref(stackCursor.async_caller);
     return rv;
 }
 
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.c b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.c
index b4d79d572a3..519d76bf1c7 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.c
@@ -45,7 +45,6 @@ sentrycrashsc_resetCursor(SentryCrashStackCursor *cursor)
 {
     cursor->state.currentDepth = 0;
     cursor->state.hasGivenUp = false;
-    cursor->state.current_async_caller = NULL;
     cursor->stackEntry.address = 0;
     cursor->stackEntry.imageAddress = 0;
     cursor->stackEntry.imageName = NULL;
@@ -59,39 +58,6 @@ sentrycrashsc_initCursor(SentryCrashStackCursor *cursor,
 {
     cursor->symbolicate = sentrycrashsymbolicator_symbolicate;
     cursor->advanceCursor = advanceCursor != NULL ? advanceCursor : g_advanceCursor;
-    cursor->async_caller = NULL;
     cursor->resetCursor = resetCursor != NULL ? resetCursor : sentrycrashsc_resetCursor;
     cursor->resetCursor(cursor);
 }
-
-bool
-sentrycrashsc_tryAsyncChain(
-    SentryCrashStackCursor *cursor, sentrycrash_async_backtrace_t *async_caller)
-{
-    if (!async_caller) {
-        return false;
-    }
-    cursor->state.current_async_caller = async_caller;
-    cursor->state.currentDepth = 0;
-
-    cursor->stackEntry.address = SentryCrashSC_ASYNC_MARKER;
-    return true;
-}
-
-bool
-sentrycrashsc_advanceAsyncCursor(SentryCrashStackCursor *cursor)
-{
-    sentrycrash_async_backtrace_t *async_caller = cursor->state.current_async_caller;
-    if (!async_caller) {
-        return false;
-    }
-    if (cursor->state.currentDepth < async_caller->len) {
-        uintptr_t nextAddress = (uintptr_t)async_caller->backtrace[cursor->state.currentDepth];
-        if (nextAddress > 1) {
-            cursor->stackEntry.address = sentrycrashcpu_normaliseInstructionPointer(nextAddress);
-            cursor->state.currentDepth++;
-            return true;
-        }
-    }
-    return sentrycrashsc_tryAsyncChain(cursor, async_caller->async_caller);
-}
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.h b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.h
index f2bac8c3d87..9edb737c43f 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.h
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor.h
@@ -31,7 +31,6 @@ extern "C" {
 #endif
 
 #include "SentryCrashMachineContext.h"
-#include "SentryHook.h"
 
 #include <stdbool.h>
 #include <sys/types.h>
@@ -73,9 +72,6 @@ typedef struct SentryCrashStackCursor {
 
         /** If true, cursor has given up walking the stack. */
         bool hasGivenUp;
-
-        /** The current async caller we are chaining to. */
-        sentrycrash_async_backtrace_t *current_async_caller;
     } state;
 
     /** Reset the cursor back to the beginning. */
@@ -88,9 +84,6 @@ typedef struct SentryCrashStackCursor {
      * stackEntry. */
     bool (*symbolicate)(struct SentryCrashStackCursor *);
 
-    /** Pointer to an optional async stacktrace. */
-    sentrycrash_async_backtrace_t *async_caller;
-
     /** Internal context-specific information. */
     void *context[SentryCrashSC_CONTEXT_SIZE];
 } SentryCrashStackCursor;
@@ -116,15 +109,6 @@ void sentrycrashsc_initCursor(SentryCrashStackCursor *cursor,
  */
 void sentrycrashsc_resetCursor(SentryCrashStackCursor *cursor);
 
-/** Chain the optional `async_caller` to the current `cursor`.
- * In case of a valid `async_caller`, this will yield a special marker frame.
- */
-bool sentrycrashsc_tryAsyncChain(
-    SentryCrashStackCursor *cursor, sentrycrash_async_backtrace_t *async_caller);
-
-/** Advance the cursor to the next stack entry in a chained async stacktrace. */
-bool sentrycrashsc_advanceAsyncCursor(SentryCrashStackCursor *cursor);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_Backtrace.c b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_Backtrace.c
index 34057a64432..76040734378 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_Backtrace.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_Backtrace.c
@@ -32,11 +32,6 @@
 static bool
 advanceCursor(SentryCrashStackCursor *cursor)
 {
-    sentrycrash_async_backtrace_t *async_caller = cursor->state.current_async_caller;
-    if (async_caller) {
-        return sentrycrashsc_advanceAsyncCursor(cursor);
-    }
-
     SentryCrashStackCursor_Backtrace_Context *context
         = (SentryCrashStackCursor_Backtrace_Context *)cursor->context;
     int endDepth = context->backtraceLength - context->skippedEntries;
@@ -51,7 +46,7 @@ advanceCursor(SentryCrashStackCursor *cursor)
             return true;
         }
     }
-    return sentrycrashsc_tryAsyncChain(cursor, cursor->async_caller);
+    return false;
 }
 
 void
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_MachineContext.c b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_MachineContext.c
index 77bb3749564..2fc998ecde0 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_MachineContext.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_MachineContext.c
@@ -58,11 +58,6 @@ typedef struct {
 static bool
 advanceCursor(SentryCrashStackCursor *cursor)
 {
-    sentrycrash_async_backtrace_t *async_caller = cursor->state.current_async_caller;
-    if (async_caller) {
-        return sentrycrashsc_advanceAsyncCursor(cursor);
-    }
-
     MachineContextCursor *context = (MachineContextCursor *)cursor->context;
     uintptr_t nextAddress = 0;
 
@@ -114,7 +109,7 @@ advanceCursor(SentryCrashStackCursor *cursor)
     return true;
 
 tryAsyncChain:
-    return sentrycrashsc_tryAsyncChain(cursor, cursor->async_caller);
+    return false;
 }
 
 static void
@@ -138,7 +133,4 @@ sentrycrashsc_initWithMachineContext(SentryCrashStackCursor *cursor, int maxStac
     context->machineContext = machineContext;
     context->maxStackDepth = maxStackDepth;
     context->instructionAddress = cursor->stackEntry.address;
-
-    SentryCrashThread thread = sentrycrashmc_getThreadFromContext(machineContext);
-    cursor->async_caller = sentrycrash_get_async_caller_for_thread(thread);
 }
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_SelfThread.c b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_SelfThread.c
index 68ae0a401fe..0f827a38015 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_SelfThread.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashStackCursor_SelfThread.c
@@ -45,6 +45,4 @@ sentrycrashsc_initSelfThread(SentryCrashStackCursor *cursor, int skipEntries)
     SelfThreadContext *context = (SelfThreadContext *)cursor->context;
     int backtraceLength = backtrace((void **)context->backtrace, MAX_BACKTRACE_LENGTH);
     sentrycrashsc_initWithBacktrace(cursor, context->backtrace, backtraceLength, skipEntries + 1);
-
-    cursor->async_caller = sentrycrash_get_async_caller_for_thread(sentrycrashthread_self());
 }
diff --git a/Sources/SentryCrash/Recording/Tools/SentryHook.c b/Sources/SentryCrash/Recording/Tools/SentryHook.c
deleted file mode 100644
index 60d030c9c14..00000000000
--- a/Sources/SentryCrash/Recording/Tools/SentryHook.c
+++ /dev/null
@@ -1,303 +0,0 @@
-#include "SentryHook.h"
-#include "SentryCrashMemory.h"
-#include "SentryCrashStackCursor.h"
-#include "fishhook.h"
-#include <dispatch/dispatch.h>
-#include <execinfo.h>
-#include <mach/mach.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-static bool hooks_active = true;
-
-void
-sentrycrash__async_backtrace_incref(sentrycrash_async_backtrace_t *bt)
-{
-    if (!bt) {
-        return;
-    }
-    __atomic_fetch_add(&bt->refcount, 1, __ATOMIC_SEQ_CST);
-}
-
-void
-sentrycrash_async_backtrace_decref(sentrycrash_async_backtrace_t *bt)
-{
-    if (!bt) {
-        return;
-    }
-    if (__atomic_fetch_add(&bt->refcount, -1, __ATOMIC_SEQ_CST) == 1) {
-        sentrycrash_async_backtrace_decref(bt->async_caller);
-        free(bt);
-    }
-}
-
-/**
- * This is a poor-mans concurrent hashtable.
- * We have N slots, using a simple FNV-like hashing function on the mach-thread id.
- *
- * *Writes* to a slot will only ever happen using the *current* thread. See
- * the `set`/`unset` functions for SAFETY descriptions.
- * *Reads* will mostly happen on the *current* thread as well, but might happen
- * across threads through `sentrycrashsc_initWithMachineContext`. See the `get`
- * function for possible UNSAFETY.
- *
- * We use a fixed number of slots and do not account for collisions, so a high
- * number of threads might lead to loss of async caller information.
- */
-
-#define SENTRY_MAX_ASYNC_THREADS (128 - 1)
-
-typedef struct {
-    SentryCrashThread thread;
-    sentrycrash_async_backtrace_t *backtrace;
-} sentrycrash_async_caller_slot_t;
-
-static sentrycrash_async_caller_slot_t sentry_async_callers[SENTRY_MAX_ASYNC_THREADS] = { 0 };
-
-static size_t
-sentrycrash__thread_idx(SentryCrashThread thread)
-{
-    // This uses the same magic numbers as FNV, but rather follows the simpler
-    // `(x * b + c) mod n` hashing scheme. Also note that `SentryCrashThread`
-    // is a typedef for a mach thread id, which is different from a `pthread_t`
-    // and should have a better distribution itself.
-    return (thread * 0x100000001b3 + 0xcbf29ce484222325) % SENTRY_MAX_ASYNC_THREADS;
-}
-
-sentrycrash_async_backtrace_t *
-sentrycrash_get_async_caller_for_thread(SentryCrashThread thread)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return NULL;
-    }
-
-    size_t idx = sentrycrash__thread_idx(thread);
-    sentrycrash_async_caller_slot_t *slot = &sentry_async_callers[idx];
-    if (__atomic_load_n(&slot->thread, __ATOMIC_ACQUIRE) == thread) {
-        sentrycrash_async_backtrace_t *backtrace
-            = __atomic_load_n(&slot->backtrace, __ATOMIC_RELAXED);
-        // UNSAFETY WARNING: There is a tiny chance of use-after-free here.
-        // This call can happen across threads, and the thread that "owns" the
-        // slot can decref and free the backtrace before *this* thread gets a
-        // chance to incref.
-        // The only codepath where this happens across threads is as part of
-        // `sentrycrashsc_initWithMachineContext` which is always done after a
-        // `sentrycrashmc_suspendEnvironment` or as part of
-        // `sentrycrashreport_writeStandardReport` which does lack such a guard.
-        sentrycrash__async_backtrace_incref(backtrace);
-        return backtrace;
-    }
-    return NULL;
-}
-
-static void
-sentrycrash__set_async_caller(sentrycrash_async_backtrace_t *backtrace)
-{
-    SentryCrashThread thread = sentrycrashthread_self();
-
-    size_t idx = sentrycrash__thread_idx(thread);
-    sentrycrash_async_caller_slot_t *slot = &sentry_async_callers[idx];
-
-    SentryCrashThread expected = (SentryCrashThread)NULL;
-    bool success = __atomic_compare_exchange_n(
-        &slot->thread, &expected, thread, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
-
-    // SAFETY: While multiple threads can race on a "set" call to the same slot,
-    // the cmpxchg makes sure that only one thread succeeds
-    if (success) {
-        __atomic_store_n(&slot->backtrace, backtrace, __ATOMIC_RELEASE);
-    }
-}
-
-static void
-sentrycrash__unset_async_caller(sentrycrash_async_backtrace_t *backtrace)
-{
-    SentryCrashThread thread = sentrycrashthread_self();
-
-    size_t idx = sentrycrash__thread_idx(thread);
-    sentrycrash_async_caller_slot_t *slot = &sentry_async_callers[idx];
-
-    // SAFETY: The condition makes sure that the current thread *owns* this slot.
-    if (__atomic_load_n(&slot->thread, __ATOMIC_ACQUIRE) == thread) {
-        __atomic_store_n(&slot->backtrace, NULL, __ATOMIC_RELAXED);
-        __atomic_store_n(&slot->thread, (SentryCrashThread)NULL, __ATOMIC_RELEASE);
-    }
-
-    sentrycrash_async_backtrace_decref(backtrace);
-}
-
-sentrycrash_async_backtrace_t *
-sentrycrash__async_backtrace_capture(void)
-{
-    sentrycrash_async_backtrace_t *bt = malloc(sizeof(sentrycrash_async_backtrace_t));
-    bt->refcount = 1;
-
-    bt->len = backtrace(bt->backtrace, MAX_BACKTRACE_FRAMES);
-
-    SentryCrashThread thread = sentrycrashthread_self();
-    bt->async_caller = sentrycrash_get_async_caller_for_thread(thread);
-
-    return bt;
-}
-
-static void (*real_dispatch_async)(dispatch_queue_t queue, dispatch_block_t block);
-
-void
-sentrycrash__hook_dispatch_async(dispatch_queue_t queue, dispatch_block_t block)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return real_dispatch_async(queue, block);
-    }
-
-    // create a backtrace, capturing the async callsite
-    sentrycrash_async_backtrace_t *bt = sentrycrash__async_backtrace_capture();
-
-    return real_dispatch_async(queue, ^{
-        // inside the async context, save the backtrace in a thread local for later consumption
-        sentrycrash__set_async_caller(bt);
-
-        // call through to the original block
-        block();
-
-        // and decref our current backtrace
-        sentrycrash__unset_async_caller(bt);
-    });
-}
-
-static void (*real_dispatch_async_f)(
-    dispatch_queue_t queue, void *_Nullable context, dispatch_function_t work);
-
-void
-sentrycrash__hook_dispatch_async_f(
-    dispatch_queue_t queue, void *_Nullable context, dispatch_function_t work)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return real_dispatch_async_f(queue, context, work);
-    }
-    sentrycrash__hook_dispatch_async(queue, ^{ work(context); });
-}
-
-static void (*real_dispatch_after)(
-    dispatch_time_t when, dispatch_queue_t queue, dispatch_block_t block);
-
-void
-sentrycrash__hook_dispatch_after(
-    dispatch_time_t when, dispatch_queue_t queue, dispatch_block_t block)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return real_dispatch_after(when, queue, block);
-    }
-
-    // create a backtrace, capturing the async callsite
-    sentrycrash_async_backtrace_t *bt = sentrycrash__async_backtrace_capture();
-
-    return real_dispatch_after(when, queue, ^{
-        // inside the async context, save the backtrace in a thread local for later consumption
-        sentrycrash__set_async_caller(bt);
-
-        // call through to the original block
-        block();
-
-        // and decref our current backtrace
-        sentrycrash__unset_async_caller(bt);
-    });
-}
-
-static void (*real_dispatch_after_f)(dispatch_time_t when, dispatch_queue_t queue,
-    void *_Nullable context, dispatch_function_t work);
-
-void
-sentrycrash__hook_dispatch_after_f(
-    dispatch_time_t when, dispatch_queue_t queue, void *_Nullable context, dispatch_function_t work)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return real_dispatch_after_f(when, queue, context, work);
-    }
-    sentrycrash__hook_dispatch_after(when, queue, ^{ work(context); });
-}
-
-static void (*real_dispatch_barrier_async)(dispatch_queue_t queue, dispatch_block_t block);
-
-void
-sentrycrash__hook_dispatch_barrier_async(dispatch_queue_t queue, dispatch_block_t block)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return real_dispatch_barrier_async(queue, block);
-    }
-
-    // create a backtrace, capturing the async callsite
-    sentrycrash_async_backtrace_t *bt = sentrycrash__async_backtrace_capture();
-
-    return real_dispatch_barrier_async(queue, ^{
-        // inside the async context, save the backtrace in a thread local for later consumption
-        sentrycrash__set_async_caller(bt);
-
-        // call through to the original block
-        block();
-
-        // and decref our current backtrace
-        sentrycrash__unset_async_caller(bt);
-    });
-}
-
-static void (*real_dispatch_barrier_async_f)(
-    dispatch_queue_t queue, void *_Nullable context, dispatch_function_t work);
-
-void
-sentrycrash__hook_dispatch_barrier_async_f(
-    dispatch_queue_t queue, void *_Nullable context, dispatch_function_t work)
-{
-    if (!__atomic_load_n(&hooks_active, __ATOMIC_RELAXED)) {
-        return real_dispatch_barrier_async_f(queue, context, work);
-    }
-    sentrycrash__hook_dispatch_barrier_async(queue, ^{ work(context); });
-}
-
-static bool hooks_installed = false;
-
-void
-sentrycrash_install_async_hooks(void)
-{
-    __atomic_store_n(&hooks_active, true, __ATOMIC_RELAXED);
-
-    if (__atomic_exchange_n(&hooks_installed, true, __ATOMIC_SEQ_CST)) {
-        return;
-    }
-
-    sentrycrash__hook_rebind_symbols(
-        (struct rebinding[6]) {
-            { "dispatch_async", sentrycrash__hook_dispatch_async, (void *)&real_dispatch_async },
-            { "dispatch_async_f", sentrycrash__hook_dispatch_async_f,
-                (void *)&real_dispatch_async_f },
-            { "dispatch_after", sentrycrash__hook_dispatch_after, (void *)&real_dispatch_after },
-            { "dispatch_after_f", sentrycrash__hook_dispatch_after_f,
-                (void *)&real_dispatch_after_f },
-            { "dispatch_barrier_async", sentrycrash__hook_dispatch_barrier_async,
-                (void *)&real_dispatch_barrier_async },
-            { "dispatch_barrier_async_f", sentrycrash__hook_dispatch_barrier_async_f,
-                (void *)&real_dispatch_barrier_async_f },
-        },
-        6);
-
-    // NOTE: We will *not* hook the following functions:
-    //
-    // - dispatch_async_and_wait
-    // - dispatch_async_and_wait_f
-    // - dispatch_barrier_async_and_wait
-    // - dispatch_barrier_async_and_wait_f
-    //
-    // Because these functions `will use the stack of the submitting thread` in some cases
-    // and our thread tracking logic would do the wrong thing in that case.
-    //
-    // See:
-    // https://github.com/apple/swift-corelibs-libdispatch/blob/f13ea5dcc055e5d2d7c02e90d8c9907ca9dc72e1/private/workloop_private.h#L321-L326
-}
-
-void
-sentrycrash_deactivate_async_hooks(void)
-{
-    // Instead of reverting the rebinding (which is not really possible), we rather
-    // deactivate the hooks. They still exist, and still get called, but they will just
-    // call through to the real libdispatch functions immediately.
-    __atomic_store_n(&hooks_active, false, __ATOMIC_RELAXED);
-}
diff --git a/Sources/SentryCrash/Recording/Tools/SentryHook.h b/Sources/SentryCrash/Recording/Tools/SentryHook.h
deleted file mode 100644
index b8c291bb4cd..00000000000
--- a/Sources/SentryCrash/Recording/Tools/SentryHook.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef SENRTY_HOOK_h
-#define SENRTY_HOOK_h
-
-#include "SentryCrashThread.h"
-#include <stdint.h>
-
-#define MAX_BACKTRACE_FRAMES 128
-
-/**
- * This represents a stacktrace that can optionally have an `async_caller` and form an async call
- * chain.
- */
-typedef struct sentrycrash_async_backtrace_s sentrycrash_async_backtrace_t;
-struct sentrycrash_async_backtrace_s {
-    size_t refcount;
-    sentrycrash_async_backtrace_t *async_caller;
-    size_t len;
-    void *backtrace[MAX_BACKTRACE_FRAMES];
-};
-
-/**
- * Returns the async caller of the current calling context, if any.
- * The async stacktrace returned has an owned reference, so it needs to be freed using
- * `sentrycrash_async_backtrace_decref`.
- */
-sentrycrash_async_backtrace_t *sentrycrash_get_async_caller_for_thread(SentryCrashThread);
-
-/** Decrements the refcount on the given `bt`. */
-void sentrycrash_async_backtrace_decref(sentrycrash_async_backtrace_t *bt);
-
-/**
- * Installs the various async hooks that sentry offers.
- *
- * The hooks work like this:
- * We overwrite the `libdispatch/dispatch_async`, etc functions with our own wrapper.
- * Those wrappers create a stacktrace in the calling thread, and pass that stacktrace via a closure
- * into the callee thread. In the callee, the stacktrace is saved as a thread-local before invoking
- * the original block/function. The thread local can be accessed for inspection and is also used for
- * chained async calls.
- */
-void sentrycrash_install_async_hooks(void);
-
-/**
- * Deactivates the previously installed hooks.
- *
- * It is not really possible to uninstall the previously installed hooks, so we rather just
- * deactivate them.
- */
-void sentrycrash_deactivate_async_hooks(void);
-
-#endif /* SENRTY_HOOK_h */
diff --git a/Sources/SentryCrash/Recording/Tools/fishhook.c b/Sources/SentryCrash/Recording/Tools/fishhook.c
deleted file mode 100644
index cb64e81d5f8..00000000000
--- a/Sources/SentryCrash/Recording/Tools/fishhook.c
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) 2013, Facebook, Inc.
-// All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name Facebook nor the names of its contributors may be used to
-//     endorse or promote products derived from this software without specific
-//     prior written permission.
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "fishhook.h"
-
-#include <dlfcn.h>
-#include <mach-o/dyld.h>
-#include <mach-o/loader.h>
-#include <mach-o/nlist.h>
-#include <mach/mach.h>
-#include <mach/vm_map.h>
-#include <mach/vm_region.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-
-#ifdef __LP64__
-typedef struct mach_header_64 mach_header_t;
-typedef struct segment_command_64 segment_command_t;
-typedef struct section_64 section_t;
-typedef struct nlist_64 nlist_t;
-#    define LC_SEGMENT_ARCH_DEPENDENT LC_SEGMENT_64
-#else
-typedef struct mach_header mach_header_t;
-typedef struct segment_command segment_command_t;
-typedef struct section section_t;
-typedef struct nlist nlist_t;
-#    define LC_SEGMENT_ARCH_DEPENDENT LC_SEGMENT
-#endif
-
-#ifndef SEG_DATA_CONST
-#    define SEG_DATA_CONST "__DATA_CONST"
-#endif
-
-#ifndef SEG_AUTH_CONST
-#    define SEG_AUTH_CONST "__AUTH_CONST"
-#endif
-
-struct rebindings_entry {
-    struct rebinding *rebindings;
-    size_t rebindings_nel;
-    struct rebindings_entry *next;
-};
-
-static struct rebindings_entry *_rebindings_head;
-
-static int
-prepend_rebindings(
-    struct rebindings_entry **rebindings_head, struct rebinding rebindings[], size_t nel)
-{
-    struct rebindings_entry *new_entry
-        = (struct rebindings_entry *)malloc(sizeof(struct rebindings_entry));
-    if (!new_entry) {
-        return -1;
-    }
-    new_entry->rebindings = (struct rebinding *)malloc(sizeof(struct rebinding) * nel);
-    if (!new_entry->rebindings) {
-        free(new_entry);
-        return -1;
-    }
-    memcpy(new_entry->rebindings, rebindings, sizeof(struct rebinding) * nel);
-    new_entry->rebindings_nel = nel;
-    new_entry->next = *rebindings_head;
-    *rebindings_head = new_entry;
-    return 0;
-}
-
-static vm_prot_t
-get_protection(void *sectionStart)
-{
-    mach_port_t task = mach_task_self();
-    vm_size_t size = 0;
-    vm_address_t address = (vm_address_t)sectionStart;
-    memory_object_name_t object;
-#if __LP64__
-    mach_msg_type_number_t count = VM_REGION_BASIC_INFO_COUNT_64;
-    vm_region_basic_info_data_64_t info;
-    kern_return_t info_ret = vm_region_64(task, &address, &size, VM_REGION_BASIC_INFO_64,
-        (vm_region_info_64_t)&info, &count, &object);
-#else
-    mach_msg_type_number_t count = VM_REGION_BASIC_INFO_COUNT;
-    vm_region_basic_info_data_t info;
-    kern_return_t info_ret = vm_region(
-        task, &address, &size, VM_REGION_BASIC_INFO, (vm_region_info_t)&info, &count, &object);
-#endif
-    if (info_ret == KERN_SUCCESS) {
-        return info.protection;
-    } else {
-        return VM_PROT_READ;
-    }
-}
-
-static void
-perform_rebinding_with_section(struct rebindings_entry *rebindings, section_t *section,
-    intptr_t slide, nlist_t *symtab, char *strtab, uint32_t *indirect_symtab)
-{
-    uint32_t *indirect_symbol_indices = indirect_symtab + section->reserved1;
-    void **indirect_symbol_bindings = (void **)((uintptr_t)slide + section->addr);
-    for (uint i = 0; i < section->size / sizeof(void *); i++) {
-        uint32_t symtab_index = indirect_symbol_indices[i];
-        if (symtab_index == INDIRECT_SYMBOL_ABS || symtab_index == INDIRECT_SYMBOL_LOCAL
-            || symtab_index == (INDIRECT_SYMBOL_LOCAL | INDIRECT_SYMBOL_ABS)) {
-            continue;
-        }
-        uint32_t strtab_offset = symtab[symtab_index].n_un.n_strx;
-        char *symbol_name = strtab + strtab_offset;
-        bool symbol_name_longer_than_1 = symbol_name[0] && symbol_name[1];
-        struct rebindings_entry *cur = rebindings;
-        while (cur) {
-            for (uint j = 0; j < cur->rebindings_nel; j++) {
-                if (symbol_name_longer_than_1
-                    && strcmp(&symbol_name[1], cur->rebindings[j].name) == 0) {
-                    if (cur->rebindings[j].replaced != NULL
-                        && indirect_symbol_bindings[i] != cur->rebindings[j].replacement) {
-                        *(cur->rebindings[j].replaced) = indirect_symbol_bindings[i];
-                    }
-                    bool is_prot_changed = false;
-                    void **address_to_write = indirect_symbol_bindings + i;
-                    vm_prot_t prot = get_protection(address_to_write);
-                    if ((prot & VM_PROT_WRITE) == 0) {
-                        is_prot_changed = true;
-                        kern_return_t success
-                            = vm_protect(mach_task_self(), (vm_address_t)address_to_write,
-                                sizeof(void *), false, prot | VM_PROT_WRITE);
-                        if (success != KERN_SUCCESS) {
-                            goto symbol_loop;
-                        }
-                    }
-                    indirect_symbol_bindings[i] = cur->rebindings[j].replacement;
-                    if (is_prot_changed) {
-                        vm_protect(mach_task_self(), (vm_address_t)address_to_write, sizeof(void *),
-                            false, prot);
-                    }
-                    goto symbol_loop;
-                }
-            }
-            cur = cur->next;
-        }
-    symbol_loop:;
-    }
-}
-
-static void
-rebind_symbols_for_image(
-    struct rebindings_entry *rebindings, const struct mach_header *header, intptr_t slide)
-{
-    Dl_info info;
-    if (dladdr(header, &info) == 0) {
-        return;
-    }
-
-    segment_command_t *cur_seg_cmd;
-    segment_command_t *linkedit_segment = NULL;
-    struct symtab_command *symtab_cmd = NULL;
-    struct dysymtab_command *dysymtab_cmd = NULL;
-
-    uintptr_t cur = (uintptr_t)header + sizeof(mach_header_t);
-    for (uint i = 0; i < header->ncmds; i++, cur += cur_seg_cmd->cmdsize) {
-        cur_seg_cmd = (segment_command_t *)cur;
-        if (cur_seg_cmd->cmd == LC_SEGMENT_ARCH_DEPENDENT) {
-            if (strcmp(cur_seg_cmd->segname, SEG_LINKEDIT) == 0) {
-                linkedit_segment = cur_seg_cmd;
-            }
-        } else if (cur_seg_cmd->cmd == LC_SYMTAB) {
-            symtab_cmd = (struct symtab_command *)cur_seg_cmd;
-        } else if (cur_seg_cmd->cmd == LC_DYSYMTAB) {
-            dysymtab_cmd = (struct dysymtab_command *)cur_seg_cmd;
-        }
-    }
-
-    if (!symtab_cmd || !dysymtab_cmd || !linkedit_segment || !dysymtab_cmd->nindirectsyms) {
-        return;
-    }
-
-    // Find base symbol/string table addresses
-    uintptr_t linkedit_base
-        = (uintptr_t)slide + linkedit_segment->vmaddr - linkedit_segment->fileoff;
-    nlist_t *symtab = (nlist_t *)(linkedit_base + symtab_cmd->symoff);
-    char *strtab = (char *)(linkedit_base + symtab_cmd->stroff);
-
-    // Get indirect symbol table (array of uint32_t indices into symbol table)
-    uint32_t *indirect_symtab = (uint32_t *)(linkedit_base + dysymtab_cmd->indirectsymoff);
-
-    cur = (uintptr_t)header + sizeof(mach_header_t);
-    for (uint i = 0; i < header->ncmds; i++, cur += cur_seg_cmd->cmdsize) {
-        cur_seg_cmd = (segment_command_t *)cur;
-        if (cur_seg_cmd->cmd == LC_SEGMENT_ARCH_DEPENDENT) {
-            if (strcmp(cur_seg_cmd->segname, SEG_DATA) != 0
-                && strcmp(cur_seg_cmd->segname, SEG_DATA_CONST) != 0
-                && strcmp(cur_seg_cmd->segname, SEG_AUTH_CONST) != 0) {
-                continue;
-            }
-            for (uint j = 0; j < cur_seg_cmd->nsects; j++) {
-                section_t *sect = (section_t *)(cur + sizeof(segment_command_t)) + j;
-                if ((sect->flags & SECTION_TYPE) == S_LAZY_SYMBOL_POINTERS) {
-                    perform_rebinding_with_section(
-                        rebindings, sect, slide, symtab, strtab, indirect_symtab);
-                }
-                if ((sect->flags & SECTION_TYPE) == S_NON_LAZY_SYMBOL_POINTERS) {
-                    perform_rebinding_with_section(
-                        rebindings, sect, slide, symtab, strtab, indirect_symtab);
-                }
-            }
-        }
-    }
-}
-
-static void
-_rebind_symbols_for_image(const struct mach_header *header, intptr_t slide)
-{
-    rebind_symbols_for_image(_rebindings_head, header, slide);
-}
-
-int
-sentrycrash__hook_rebind_symbols_image(
-    void *header, intptr_t slide, struct rebinding rebindings[], size_t rebindings_nel)
-{
-    struct rebindings_entry *rebindings_head = NULL;
-    int retval = prepend_rebindings(&rebindings_head, rebindings, rebindings_nel);
-    rebind_symbols_for_image(rebindings_head, (const struct mach_header *)header, slide);
-    if (rebindings_head) {
-        free(rebindings_head->rebindings);
-    }
-    free(rebindings_head);
-    return retval;
-}
-
-int
-sentrycrash__hook_rebind_symbols(struct rebinding rebindings[], size_t rebindings_nel)
-{
-    int retval = prepend_rebindings(&_rebindings_head, rebindings, rebindings_nel);
-    if (retval < 0) {
-        return retval;
-    }
-    // If this was the first call, register callback for image additions (which is also invoked for
-    // existing images, otherwise, just run on existing images
-    if (!_rebindings_head->next) {
-        _dyld_register_func_for_add_image(_rebind_symbols_for_image);
-    } else {
-        uint32_t c = _dyld_image_count();
-        for (uint32_t i = 0; i < c; i++) {
-            _rebind_symbols_for_image(_dyld_get_image_header(i), _dyld_get_image_vmaddr_slide(i));
-        }
-    }
-    return retval;
-}
diff --git a/Sources/SentryCrash/Recording/Tools/fishhook.h b/Sources/SentryCrash/Recording/Tools/fishhook.h
deleted file mode 100644
index eba1b877cdc..00000000000
--- a/Sources/SentryCrash/Recording/Tools/fishhook.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) 2013, Facebook, Inc.
-// All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//   * Redistributions of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//   * Redistributions in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//   * Neither the name Facebook nor the names of its contributors may be used to
-//     endorse or promote products derived from this software without specific
-//     prior written permission.
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef fishhook_h
-#define fishhook_h
-
-#include <stddef.h>
-#include <stdint.h>
-
-#if !defined(FISHHOOK_EXPORT)
-#    define FISHHOOK_VISIBILITY __attribute__((visibility("hidden")))
-#else
-#    define FISHHOOK_VISIBILITY __attribute__((visibility("default")))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif //__cplusplus
-
-/*
- * A structure representing a particular intended rebinding from a symbol
- * name to its replacement
- */
-struct rebinding {
-    const char *name;
-    void *replacement;
-    void **replaced;
-};
-
-/*
- * For each rebinding in rebindings, rebinds references to external, indirect
- * symbols with the specified name to instead point at replacement for each
- * image in the calling process as well as for all future images that are loaded
- * by the process. If rebind_functions is called more than once, the symbols to
- * rebind are added to the existing list of rebindings, and if a given symbol
- * is rebound more than once, the later rebinding will take precedence.
- */
-FISHHOOK_VISIBILITY
-int sentrycrash__hook_rebind_symbols(struct rebinding rebindings[], size_t rebindings_nel);
-
-/*
- * Rebinds as above, but only in the specified image. The header should point
- * to the mach-o header, the slide should be the slide offset. Others as above.
- */
-FISHHOOK_VISIBILITY
-int sentrycrash__hook_rebind_symbols_image(
-    void *header, intptr_t slide, struct rebinding rebindings[], size_t rebindings_nel);
-
-#ifdef __cplusplus
-}
-#endif //__cplusplus
-
-#endif // fishhook_h