diff --git a/Braintree.xcodeproj/project.pbxproj b/Braintree.xcodeproj/project.pbxproj
index 603fff4900..d6dfa7f81f 100644
--- a/Braintree.xcodeproj/project.pbxproj
+++ b/Braintree.xcodeproj/project.pbxproj
@@ -692,7 +692,6 @@
 		A7B7434019A3E4B5000A6A7A /* BTVenmoAppSwitchRequestURL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTVenmoAppSwitchRequestURL.m; sourceTree = "<group>"; };
 		A7C7F82D19B905C400493311 /* BTPaymentProviderErrors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTPaymentProviderErrors.m; sourceTree = "<group>"; };
 		A7CB617319B7B13000E972A8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		A7E5BEAF19ABDA59006AEB9B /* BTClient_Metadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTClient_Metadata.h; sourceTree = "<group>"; };
 		A7E5BEB019ABE5D0006AEB9B /* BTAppSwitchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BTAppSwitchSpec.m; sourceTree = "<group>"; };
 		A7E5BEB319ABE5F3006AEB9B /* BTAppSwitch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BTAppSwitch.h; sourceTree = "<group>"; };
 		A7E5BEB419ABE5F3006AEB9B /* BTAppSwitch.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BTAppSwitch.m; sourceTree = "<group>"; };
@@ -1035,7 +1034,6 @@
 				A7E5BEB519ABE5F3006AEB9B /* BTAppSwitching.h */,
 				77037AD319B0112A0097DADE /* BTAppSwitchingDelegate.h */,
 				16217420192D85EB008DC35D /* BTCardPaymentMethod.h */,
-				A7E5BEAF19ABDA59006AEB9B /* BTClient_Metadata.h */,
 				16217423192D85EB008DC35D /* BTClient.h */,
 				16217421192D85EB008DC35D /* BTClient+Offline.h */,
 				16217422192D85EB008DC35D /* BTClient+Testing.h */,
diff --git a/Braintree/API/@Public/BTClient_Metadata.h b/Braintree/API/@Public/BTClient_Metadata.h
deleted file mode 100644
index 0d68e4d0cb..0000000000
--- a/Braintree/API/@Public/BTClient_Metadata.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#import "BTClient.h"
-#import "BTClientMetadata.h"
-
-@interface BTClient ()
-
-@property (nonatomic, copy, readonly) BTClientMetadata *metadata;
-
-///  Copy of the instance, but with different metadata
-///
-///  Useful for temporary metadata overrides.
-///
-///  @param metadataBlock block for customizing metadata
-- (instancetype)copyWithMetadata:(void (^)(BTClientMutableMetadata *metadata))metadataBlock;
-
-@end
diff --git a/Braintree/API/Client/BTClient.m b/Braintree/API/Client/BTClient.m
index ebba2c055e..f12058f580 100644
--- a/Braintree/API/Client/BTClient.m
+++ b/Braintree/API/Client/BTClient.m
@@ -1,7 +1,5 @@
 @import PassKit;
 
-#import "BTClient.h"
-#import "BTClient_Metadata.h"
 #import "BTClient_Internal.h"
 #import "BTClientToken.h"
 #import "BTLogger_Internal.h"
diff --git a/Braintree/API/Client/BTClient_Internal.h b/Braintree/API/Client/BTClient_Internal.h
index d494253124..f8082bf30c 100644
--- a/Braintree/API/Client/BTClient_Internal.h
+++ b/Braintree/API/Client/BTClient_Internal.h
@@ -1,6 +1,7 @@
 #import "BTClient.h"
 #import "BTHTTP.h"
 #import "BTClientToken.h"
+#import "BTClientMetadata.h"
 
 @interface BTClient ()
 @property (nonatomic, strong, readwrite) BTHTTP *clientApiHttp;
@@ -9,9 +10,13 @@
 /// Models the contents of the client token, as it is received from the merchant server
 @property (nonatomic, strong) BTClientToken *clientToken;
 
-// Internal helpers
-// Declared here to make available for testing
-// TODO: Delete me
-//+ (BTPayPalPaymentMethod *)payPalPaymentMethodFromAPIResponseDictionary:(NSDictionary *)response;
+@property (nonatomic, copy, readonly) BTClientMetadata *metadata;
+
+///  Copy of the instance, but with different metadata
+///
+///  Useful for temporary metadata overrides.
+///
+///  @param metadataBlock block for customizing metadata
+- (instancetype)copyWithMetadata:(void (^)(BTClientMutableMetadata *metadata))metadataBlock;
 
 @end
diff --git a/Braintree/Drop-In/BTDropInViewController.m b/Braintree/Drop-In/BTDropInViewController.m
index 4e51576080..8033391e7f 100644
--- a/Braintree/Drop-In/BTDropInViewController.m
+++ b/Braintree/Drop-In/BTDropInViewController.m
@@ -10,7 +10,7 @@
 #import "BTDropInErrorAlert.h"
 #import "BTDropInLocalizedString.h"
 #import "BTPaymentMethodCreationDelegate.h"
-#import "BTClient_Metadata.h"
+#import "BTClient_Internal.h"
 #import "BTLogger_Internal.h"
 
 @interface BTDropInViewController () < BTDropInSelectPaymentMethodViewControllerDelegate, BTUIScrollViewScrollRectToVisibleDelegate, BTUICardFormViewDelegate, BTPaymentMethodCreationDelegate, BTDropInViewControllerDelegate>
diff --git a/Braintree/PayPal/BTPayPalAppSwitchHandler.m b/Braintree/PayPal/BTPayPalAppSwitchHandler.m
index e30c4acfd4..af611e3db1 100644
--- a/Braintree/PayPal/BTPayPalAppSwitchHandler.m
+++ b/Braintree/PayPal/BTPayPalAppSwitchHandler.m
@@ -1,6 +1,6 @@
 #import "BTPayPalAppSwitchHandler_Internal.h"
 
-#import "BTClient_Metadata.h"
+#import "BTClient_Internal.h"
 #import "BTClient+BTPayPal.h"
 #import "BTMutablePayPalPaymentMethod.h"
 #import "BTLogger_Internal.h"
diff --git a/Braintree/PayPal/BTPayPalViewController.m b/Braintree/PayPal/BTPayPalViewController.m
index 6af3fd88fa..a6527cb858 100644
--- a/Braintree/PayPal/BTPayPalViewController.m
+++ b/Braintree/PayPal/BTPayPalViewController.m
@@ -1,7 +1,7 @@
 #import "BTPayPalViewController_Internal.h"
 
 #import "BTClient+BTPayPal.h"
-#import "BTClient_Metadata.h"
+#import "BTClient_Internal.h"
 #import "BTErrors+BTPayPal.h"
 
 #import "BTMutablePayPalPaymentMethod.h"
diff --git a/Braintree/Venmo/BTVenmoAppSwitchHandler.m b/Braintree/Venmo/BTVenmoAppSwitchHandler.m
index 85b3efa1fd..3e32676c7e 100644
--- a/Braintree/Venmo/BTVenmoAppSwitchHandler.m
+++ b/Braintree/Venmo/BTVenmoAppSwitchHandler.m
@@ -3,7 +3,7 @@
 #import "BTVenmoAppSwitchRequestURL.h"
 #import "BTVenmoAppSwitchReturnURL.h"
 #import "BTClient+BTVenmo.h"
-#import "BTClient_Metadata.h"
+#import "BTClient_Internal.h"
 #import "BTMutableCardPaymentMethod.h"
 
 @implementation BTVenmoAppSwitchHandler
diff --git a/Specs/Braintree-API-Specs/BTClientSpec.m b/Specs/Braintree-API-Specs/BTClientSpec.m
index 159d197a82..3c9767f9d5 100644
--- a/Specs/Braintree-API-Specs/BTClientSpec.m
+++ b/Specs/Braintree-API-Specs/BTClientSpec.m
@@ -5,7 +5,6 @@
 #import "BTClient+Testing.h"
 #import "BTTestClientTokenFactory.h"
 #import "BTAnalyticsMetadata.h"
-#import "BTClient_Metadata.h"
 
 #import "BTLogger_Internal.h"
 
diff --git a/Specs/Braintree-API-Specs/BTClient_MetadataSpec.m b/Specs/Braintree-API-Specs/BTClient_MetadataSpec.m
index ea9de66b5a..46853da508 100644
--- a/Specs/Braintree-API-Specs/BTClient_MetadataSpec.m
+++ b/Specs/Braintree-API-Specs/BTClient_MetadataSpec.m
@@ -1,7 +1,7 @@
 #import "BTClient_Internal.h"
 #import "BTClient+Offline.h"
 #import "BTClient+Testing.h"
-#import "BTClient_Metadata.h"
+#import "BTClient_Internal.h"
 
 SpecBegin(BTClient_Metadata)