diff --git a/CMakeLists.txt b/CMakeLists.txt
index 439ea7d5c7..a29d25db2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,8 @@ if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
   set(FIREBASE_INCLUDE_GMA OFF)
 endif()
 
+
+
 # Occasionally ANDROID is not being set correctly when invoked by gradle, so
 # set it manually if ANDROID_NDK has been defined.
 if(DEFINED ANDROID_NDK)
@@ -627,12 +629,10 @@ endif()
 if (FIREBASE_INCLUDE_FUNCTIONS)
   add_subdirectory(functions)
 endif()
-if (FIREBASE_INCLUDE_GMA)
-  add_subdirectory(gma)
-endif()
 if (FIREBASE_INCLUDE_INSTALLATIONS)
   add_subdirectory(installations)
 endif()
+
 if (FIREBASE_INCLUDE_MESSAGING)
   add_subdirectory(messaging)
 endif()
diff --git a/README.md b/README.md
index 6a829a9a07..b7cf852b42 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,10 @@ iOS, and desktop platforms. It includes the following Firebase libraries:
 |||
 |--|--|
 |[Google Analytics for Firebase](https://firebase.google.com/docs/analytics/)|
+|[Firebase App Check](https://firebase.google.com/docs/app-check/)|
 |[Firebase Authentication](https://firebase.google.com/docs/auth/)|[Firebase Realtime Database](https://firebase.google.com/docs/database/)|
 |[Firebase Dynamic Links](https://firebase.google.com/docs/dynamic-links/)|[Cloud Firestore](https://firebase.google.com/docs/firestore/)|
-|[Cloud Functions for Firebase](https://firebase.google.com/docs/functions/)|[Firebase Invites](https://firebase.google.com/docs/invites/)|
+|[Cloud Functions for Firebase](https://firebase.google.com/docs/functions/)|
 |[Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/)|[Firebase Remote Config](https://firebase.google.com/docs/remote-config/)|
 |[Cloud Storage for Firebase](https://firebase.google.com/docs/storage/)|
 
diff --git a/build_scripts/ios/build.sh b/build_scripts/ios/build.sh
index 12ac66e93b..42a7782cb9 100755
--- a/build_scripts/ios/build.sh
+++ b/build_scripts/ios/build.sh
@@ -27,7 +27,7 @@ readonly SUPPORTED_PLATFORMS=(device simulator)
 readonly SUPPORTED_ARCHITECTURES=(arm64 x86_64)
 readonly DEVICE_ARCHITECTURES=(arm64)
 readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
-readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_gma firebase_installations firebase_messaging firebase_remote_config firebase_storage)
+readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_installations firebase_messaging firebase_remote_config firebase_storage)
 
 # build default value
 buildpath="ios_build"
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index ae6d754b2c..7654cbb5e3 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -385,8 +385,6 @@ Google Mobile Ads (stub)        | libfirebase_gma.a
 |                               | libfirebase_app.a
 Firebase Installations (stub)   | libfirebase_installations.a
 |                               | libfirebase_app.a
-Firebase Cloud Messaging (stub) | libfirebase_messaging.a
-|                               | libfirebase_app.a
 
 The provided libraries have been tested using GCC 4.8.0, GCC 7.2.0, and Clang
 5.0 on Ubuntu. When building C++ desktop apps on Linux, you will need to link
@@ -472,8 +470,6 @@ Google Mobile Ads (stub)        | firebase_gma.lib
 |                               | firebase_app.lib
 Firebase Installations (stub)   | firebase_installations.lib
 |                               | firebase_app.lib
-Firebase Cloud Messaging (stub) | firebase_messaging.lib
-|                               | firebase_app.lib
 
 The provided libraries have been tested using Visual Studio 2019. When
 building C++ desktop apps on Windows, you will need to link the following
@@ -591,7 +587,6 @@ Instance ID          | Required
 Google Mobile Ads    | Not required (usually; see below)
 Realtime Database    | Required
 Remote Config        | Required
-Storage              | Required
 
 #### A note on Google Mobile Ads and Google Play services
 
diff --git a/settings.gradle b/settings.gradle
index 0ec81050fc..5fe4748996 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,6 @@ include ':app',
         ':firestore',
         ':firestore:firestore_resources',
         ':functions',
-        ':gma',
-        ':gma:gma_resources',
         ':installations',
         ':messaging',
         ':messaging:messaging_java',