diff --git a/Example/Firebase.xcodeproj/project.pbxproj b/Example/Firebase.xcodeproj/project.pbxproj
index 5c0d5f084e..a492e3c214 100644
--- a/Example/Firebase.xcodeproj/project.pbxproj
+++ b/Example/Firebase.xcodeproj/project.pbxproj
@@ -5690,10 +5690,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/DynamicLinks/App/iOS/DL-Info.plist";
 				MODULE_NAME = ExampleApp;
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-all_load",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.DynamicLinks-Example-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -5715,10 +5712,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/DynamicLinks/App/iOS/DL-Info.plist";
 				MODULE_NAME = ExampleApp;
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-all_load",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.DynamicLinks-Example-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
diff --git a/Example/Podfile b/Example/Podfile
index 6561b5adca..9a1b737bb6 100644
--- a/Example/Podfile
+++ b/Example/Podfile
@@ -15,7 +15,7 @@ target 'Core_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/CoreOnly', '5.8.0'
+  pod 'Firebase/CoreOnly', '5.8.1'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths
@@ -54,9 +54,6 @@ target 'DynamicLinks_Example_iOS' do
   platform :ios, '8.0'
 
   pod 'FirebaseDynamicLinks', :path => '../'
-  # Temporary for testing until 5.9.0 goes out
-  pod 'FirebaseAnalytics', :path => '../'
-  pod 'GoogleAppMeasurement', :path => '../'
 
   target 'DynamicLinks_Tests_iOS' do
     inherit! :search_paths
diff --git a/FirebaseAnalytics.podspec.json b/FirebaseAnalytics.podspec.json
deleted file mode 100644
index d21dfc0a36..0000000000
--- a/FirebaseAnalytics.podspec.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "authors": "Google, Inc.",
-  "dependencies": {
-    "FirebaseCore": "~> 5.1",
-    "FirebaseInstanceID": "~> 3.2",
-    "GoogleAppMeasurement": "~> 5.1",
-    "GoogleUtilities/AppDelegateSwizzler": "~> 5.2",
-    "GoogleUtilities/MethodSwizzler": "~> 5.2",
-    "GoogleUtilities/NSData+zlib": "~> 5.2",
-    "GoogleUtilities/Network": "~> 5.2",
-    "nanopb": "~> 0.3"
-  },
-  "description": "Firebase Analytics is a free, out-of-the-box analytics solution that inspires actionable insights based on app usage and user engagement.",
-  "frameworks": [
-    "StoreKit"
-  ],
-  "homepage": "https://firebase.google.com/features/analytics/",
-  "libraries": [
-    "c++",
-    "sqlite3",
-    "z"
-  ],
-  "license": {
-    "text": "Copyright 2018 Google",
-    "type": "Copyright"
-  },
-  "name": "FirebaseAnalytics",
-  "platforms": {
-    "ios": "8.0"
-  },
-  "source": {
-    "http": "https://dl.google.com/dl/cpdc/f0e97b03de33925b/FirebaseAnalytics-5.1.2.tar.gz"
-  },
-  "summary": "Firebase Analytics for iOS",
-  "vendored_frameworks": [
-    "Frameworks/FirebaseAnalytics.framework",
-    "Frameworks/FirebaseCoreDiagnostics.framework"
-  ],
-  "version": "5.1.2"
-}
\ No newline at end of file
diff --git a/GoogleAppMeasurement.podspec.json b/GoogleAppMeasurement.podspec.json
deleted file mode 100644
index 8ee8757c39..0000000000
--- a/GoogleAppMeasurement.podspec.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "authors": "Google, Inc.",
-  "dependencies": {
-    "GoogleUtilities/AppDelegateSwizzler": "~> 5.2",
-    "GoogleUtilities/MethodSwizzler": "~> 5.2",
-    "GoogleUtilities/NSData+zlib": "~> 5.2",
-    "GoogleUtilities/Network": "~> 5.2",
-    "nanopb": "~> 0.3"
-  },
-  "description": "Measurement methods that are shared between Google libraries. This pod does not expose any headers and isn't intended for direct use, but rather as a dependency of some Google libraries.",
-  "frameworks": [
-    "StoreKit"
-  ],
-  "homepage": "https://developers.google.com/ios",
-  "libraries": [
-    "c++",
-    "sqlite3",
-    "z"
-  ],
-  "license": {
-    "text": "Copyright 2018 Google",
-    "type": "Copyright"
-  },
-  "name": "GoogleAppMeasurement",
-  "platforms": {
-    "ios": "6.0"
-  },
-  "source": {
-    "http": "https://dl.google.com/dl/cpdc/9f69ad0083134fe1/GoogleAppMeasurement-5.1.2.tar.gz"
-  },
-  "summary": "Shared measurement methods for Google libraries. Not intended for direct use.",
-  "vendored_frameworks": [
-    "Frameworks/GoogleAppMeasurement.framework"
-  ],
-  "version": "5.1.2"
-}
\ No newline at end of file