From cefecede817036c7761870a17fb2fe92ad2d1b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0rfan=20Evrens?= <irfanevrens@gmail.com>
Date: Thu, 25 Jun 2015 23:08:11 +0300
Subject: [PATCH 1/4] Tiny improvements.

---
 lib/PayPal/Api/Address.php                |  2 --
 lib/PayPal/Api/Agreement.php              |  3 +--
 lib/PayPal/Api/Authorization.php          |  3 +--
 lib/PayPal/Api/Capture.php                |  3 +--
 lib/PayPal/Api/CreditCardHistory.php      |  6 ++----
 lib/PayPal/Api/FuturePayment.php          |  1 -
 lib/PayPal/Api/InvoiceAddress.php         |  2 --
 lib/PayPal/Api/OpenIdAddress.php          | 11 ++++++++++-
 lib/PayPal/Api/OpenIdError.php            |  6 ++++++
 lib/PayPal/Api/OpenIdSession.php          | 10 ++++++----
 lib/PayPal/Api/OpenIdTokeninfo.php        | 10 +++++++++-
 lib/PayPal/Api/OpenIdUserinfo.php         | 24 +++++++++++++++++++++++
 lib/PayPal/Api/Order.php                  |  4 +---
 lib/PayPal/Api/Payee.php                  |  1 -
 lib/PayPal/Api/Payment.php                |  4 +---
 lib/PayPal/Api/Plan.php                   |  3 +--
 lib/PayPal/Api/Sale.php                   |  3 ++-
 lib/PayPal/Api/ShippingAddress.php        |  2 --
 lib/PayPal/Api/TransactionBase.php        |  3 ---
 lib/PayPal/Api/Transactions.php           |  1 -
 lib/PayPal/Api/WebProfile.php             |  3 +--
 lib/PayPal/Api/Webhook.php                |  3 +--
 lib/PayPal/Api/WebhookEventType.php       |  3 +--
 lib/PayPal/Auth/OAuthTokenCredential.php  |  3 +++
 lib/PayPal/Common/PayPalResourceModel.php |  3 +--
 lib/PayPal/Core/PayPalHttpConnection.php  |  1 +
 26 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/lib/PayPal/Api/Address.php b/lib/PayPal/Api/Address.php
index 175db20..a8f72fd 100644
--- a/lib/PayPal/Api/Address.php
+++ b/lib/PayPal/Api/Address.php
@@ -2,8 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-
 /**
  * Class Address
  *
diff --git a/lib/PayPal/Api/Agreement.php b/lib/PayPal/Api/Agreement.php
index b0899b8..810dde2 100644
--- a/lib/PayPal/Api/Agreement.php
+++ b/lib/PayPal/Api/Agreement.php
@@ -4,10 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Core\PayPalConstants;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\AgreementTransactions;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Agreement
diff --git a/lib/PayPal/Api/Authorization.php b/lib/PayPal/Api/Authorization.php
index f424790..68a72fe 100644
--- a/lib/PayPal/Api/Authorization.php
+++ b/lib/PayPal/Api/Authorization.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Capture;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Authorization
diff --git a/lib/PayPal/Api/Capture.php b/lib/PayPal/Api/Capture.php
index 288d67f..7a573c1 100644
--- a/lib/PayPal/Api/Capture.php
+++ b/lib/PayPal/Api/Capture.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Refund;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Capture
diff --git a/lib/PayPal/Api/CreditCardHistory.php b/lib/PayPal/Api/CreditCardHistory.php
index 636429c..2c0874e 100644
--- a/lib/PayPal/Api/CreditCardHistory.php
+++ b/lib/PayPal/Api/CreditCardHistory.php
@@ -3,7 +3,6 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class CreditCardHistory
@@ -20,10 +19,9 @@ class CreditCardHistory extends PayPalModel
 {
     /**
      * A list of credit card resources
-     * 
      *
-     * @param \PayPal\Api\CreditCard $credit-cards
-     * 
+     *
+     * @param $credit_cards
      * @return $this
      */
     public function setCreditCards($credit_cards)
diff --git a/lib/PayPal/Api/FuturePayment.php b/lib/PayPal/Api/FuturePayment.php
index 2bdc991..7e49a37 100644
--- a/lib/PayPal/Api/FuturePayment.php
+++ b/lib/PayPal/Api/FuturePayment.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
 
diff --git a/lib/PayPal/Api/InvoiceAddress.php b/lib/PayPal/Api/InvoiceAddress.php
index b8cd850..7e8786a 100644
--- a/lib/PayPal/Api/InvoiceAddress.php
+++ b/lib/PayPal/Api/InvoiceAddress.php
@@ -2,8 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-
 /**
  * Class InvoiceAddress
  *
diff --git a/lib/PayPal/Api/OpenIdAddress.php b/lib/PayPal/Api/OpenIdAddress.php
index 4bfe2dd..306abf6 100644
--- a/lib/PayPal/Api/OpenIdAddress.php
+++ b/lib/PayPal/Api/OpenIdAddress.php
@@ -5,11 +5,20 @@ namespace PayPal\Api;
 use PayPal\Common\PayPalModel;
 
 /**
+ * Class OpenIdAddress
+ *
  * End-User's preferred address.
+ *
+ * @package PayPal\Api
+ *
+ * @property string street_address
+ * @property string locality
+ * @property string region
+ * @property string postal_code
+ * @property string country
  */
 class OpenIdAddress extends PayPalModel
 {
-
     /**
      * Full street address component, which may include house number, street name.
      *
diff --git a/lib/PayPal/Api/OpenIdError.php b/lib/PayPal/Api/OpenIdError.php
index 18b488b..4b9b956 100644
--- a/lib/PayPal/Api/OpenIdError.php
+++ b/lib/PayPal/Api/OpenIdError.php
@@ -4,7 +4,13 @@ namespace PayPal\Api;
 use PayPal\Common\PayPalModel;
 
 /**
+ * Class OpenIdError
+ *
  * Error resource
+ *
+ * @property string error
+ * @property string error_description
+ * @property string error_uri
  */
 class OpenIdError extends PayPalModel
 {
diff --git a/lib/PayPal/Api/OpenIdSession.php b/lib/PayPal/Api/OpenIdSession.php
index cd6c397..088026d 100644
--- a/lib/PayPal/Api/OpenIdSession.php
+++ b/lib/PayPal/Api/OpenIdSession.php
@@ -12,13 +12,15 @@ class OpenIdSession
      * Returns the PayPal URL to which the user must be redirected to
      * start the authentication / authorization process.
      *
-     * @param string     $redirectUri   Uri on merchant website to where
+     * @param string $redirectUri Uri on merchant website to where
      *                                  the user must be redirected to post paypal login
-     * @param array      $scope         The access privilges that you are requesting for
+     * @param array $scope The access privilges that you are requesting for
      *                                  from the user. Pass empty array for all scopes.
-     * @param string     $clientId      client id from developer portal
+     * @param string $clientId client id from developer portal
      *                                  See https://developer.paypal.com/webapps/developer/docs/integration/direct/log-in-with-paypal/detailed/#attributes for more
-     * @param ApiContext $apiContext    Optional API Context
+     * @param null $nonce
+     * @param null $state
+     * @param ApiContext $apiContext Optional API Context
      * @return string Authorization URL
      */
     public static function getAuthorizationUrl($redirectUri, $scope, $clientId, $nonce = null, $state = null, $apiContext = null)
diff --git a/lib/PayPal/Api/OpenIdTokeninfo.php b/lib/PayPal/Api/OpenIdTokeninfo.php
index 39a660a..7d9cc97 100644
--- a/lib/PayPal/Api/OpenIdTokeninfo.php
+++ b/lib/PayPal/Api/OpenIdTokeninfo.php
@@ -1,13 +1,21 @@
 <?php
 namespace PayPal\Api;
 
-
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
 
 /**
+ * Class OpenIdTokeninfo
+ *
  * Token grant resource
+ *
+ * @property string scope
+ * @property string access_token
+ * @property string refresh_token
+ * @property string token_type
+ * @property string id_token
+ * @property int expires_in
  */
 class OpenIdTokeninfo extends PayPalResourceModel
 {
diff --git a/lib/PayPal/Api/OpenIdUserinfo.php b/lib/PayPal/Api/OpenIdUserinfo.php
index 445505a..46c00b8 100644
--- a/lib/PayPal/Api/OpenIdUserinfo.php
+++ b/lib/PayPal/Api/OpenIdUserinfo.php
@@ -5,7 +5,31 @@ use PayPal\Common\PayPalResourceModel;
 use PayPal\Rest\ApiContext;
 
 /**
+ * Class OpenIdUserinfo
+ *
  * OpenIdConnect UserInfo Resource
+ *
+ * @property string user_id
+ * @property string sub
+ * @property mixed name
+ * @property string given_name
+ * @property string family_name
+ * @property string middle_name
+ * @property string picture
+ * @property string email
+ * @property bool email_verified
+ * @property string gender
+ * @property string birthday
+ * @property string zoneinfo
+ * @property string locale
+ * @property string language
+ * @property bool verified
+ * @property string phone_number
+ * @property OpenIdAddress address
+ * @property mixed verified_account
+ * @property mixed account_type
+ * @property string age_range
+ * @property string payer_id
  */
 class OpenIdUserinfo extends PayPalResourceModel
 {
diff --git a/lib/PayPal/Api/Order.php b/lib/PayPal/Api/Order.php
index fd84dc6..d8153db 100644
--- a/lib/PayPal/Api/Order.php
+++ b/lib/PayPal/Api/Order.php
@@ -3,11 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Capture;
-use PayPal\Api\Authorization;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Order
diff --git a/lib/PayPal/Api/Payee.php b/lib/PayPal/Api/Payee.php
index 31344cd..6225f6b 100644
--- a/lib/PayPal/Api/Payee.php
+++ b/lib/PayPal/Api/Payee.php
@@ -3,7 +3,6 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class Payee
diff --git a/lib/PayPal/Api/Payment.php b/lib/PayPal/Api/Payment.php
index 502d327..968170e 100644
--- a/lib/PayPal/Api/Payment.php
+++ b/lib/PayPal/Api/Payment.php
@@ -4,11 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Core\PayPalConstants;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\object;
-use PayPal\Api\PaymentHistory;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Payment
diff --git a/lib/PayPal/Api/Plan.php b/lib/PayPal/Api/Plan.php
index 4201903..630a9dc 100644
--- a/lib/PayPal/Api/Plan.php
+++ b/lib/PayPal/Api/Plan.php
@@ -4,10 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\PlanList;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Plan
diff --git a/lib/PayPal/Api/Sale.php b/lib/PayPal/Api/Sale.php
index d5e0a65..9301b0d 100644
--- a/lib/PayPal/Api/Sale.php
+++ b/lib/PayPal/Api/Sale.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Sale
@@ -15,6 +15,7 @@ use PayPal\Transport\PayPalRestCall;
  * @package PayPal\Api
  *
  * @property string id
+ * @property string purchase_unit_reference_id
  * @property string create_time
  * @property string update_time
  * @property \PayPal\Api\Amount amount
diff --git a/lib/PayPal/Api/ShippingAddress.php b/lib/PayPal/Api/ShippingAddress.php
index 4f5ef07..9bde918 100644
--- a/lib/PayPal/Api/ShippingAddress.php
+++ b/lib/PayPal/Api/ShippingAddress.php
@@ -2,8 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-
 /**
  * Class ShippingAddress
  *
diff --git a/lib/PayPal/Api/TransactionBase.php b/lib/PayPal/Api/TransactionBase.php
index 9038065..bf92833 100644
--- a/lib/PayPal/Api/TransactionBase.php
+++ b/lib/PayPal/Api/TransactionBase.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
-
 /**
  * Class TransactionBase
  *
diff --git a/lib/PayPal/Api/Transactions.php b/lib/PayPal/Api/Transactions.php
index 100fff5..f7a09c1 100644
--- a/lib/PayPal/Api/Transactions.php
+++ b/lib/PayPal/Api/Transactions.php
@@ -3,7 +3,6 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class Transactions
diff --git a/lib/PayPal/Api/WebProfile.php b/lib/PayPal/Api/WebProfile.php
index 3f9c209..0d5a8f6 100644
--- a/lib/PayPal/Api/WebProfile.php
+++ b/lib/PayPal/Api/WebProfile.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\CreateProfileResponse;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class WebProfile
diff --git a/lib/PayPal/Api/Webhook.php b/lib/PayPal/Api/Webhook.php
index d6098f4..de02b77 100644
--- a/lib/PayPal/Api/Webhook.php
+++ b/lib/PayPal/Api/Webhook.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookList;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 use PayPal\Validation\UrlValidator;
 
 /**
diff --git a/lib/PayPal/Api/WebhookEventType.php b/lib/PayPal/Api/WebhookEventType.php
index 23dcbb6..ad3d579 100644
--- a/lib/PayPal/Api/WebhookEventType.php
+++ b/lib/PayPal/Api/WebhookEventType.php
@@ -3,10 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookEventList;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class WebhookEventType
diff --git a/lib/PayPal/Auth/OAuthTokenCredential.php b/lib/PayPal/Auth/OAuthTokenCredential.php
index d84dfe0..750ab7d 100644
--- a/lib/PayPal/Auth/OAuthTokenCredential.php
+++ b/lib/PayPal/Auth/OAuthTokenCredential.php
@@ -198,6 +198,8 @@ class OAuthTokenCredential extends PayPalResourceModel
         if ($response != null && isset($response["refresh_token"])) {
             return $response['refresh_token'];
         }
+
+        return null;
     }
 
     /**
@@ -251,6 +253,7 @@ class OAuthTokenCredential extends PayPalResourceModel
      * Generates a new access token
      *
      * @param array $config
+     * @param null|string $refreshToken
      * @return null
      * @throws PayPalConnectionException
      */
diff --git a/lib/PayPal/Common/PayPalResourceModel.php b/lib/PayPal/Common/PayPalResourceModel.php
index 6b9ec01..7662db1 100644
--- a/lib/PayPal/Common/PayPalResourceModel.php
+++ b/lib/PayPal/Common/PayPalResourceModel.php
@@ -1,12 +1,11 @@
 <?php
 
 namespace PayPal\Common;
-use PayPal\Handler\IPayPalHandler;
+
 use PayPal\Rest\ApiContext;
 use PayPal\Rest\IResource;
 use PayPal\Transport\PayPalRestCall;
 
-
 /**
  * Class PayPalResourceModel
  * An Executable PayPalModel Class
diff --git a/lib/PayPal/Core/PayPalHttpConnection.php b/lib/PayPal/Core/PayPalHttpConnection.php
index ffc05d2..251908a 100644
--- a/lib/PayPal/Core/PayPalHttpConnection.php
+++ b/lib/PayPal/Core/PayPalHttpConnection.php
@@ -93,6 +93,7 @@ class PayPalHttpConnection
         switch ($this->httpConfig->getMethod()) {
             case 'POST':
                 curl_setopt($ch, CURLOPT_POST, true);
+                break;
             case 'PUT':
             case 'PATCH':
             case 'DELETE':

From def426fd2329786ba89dc5856e5c2c5fbcef3d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0rfan=20Evrens?= <irfanevrens@gmail.com>
Date: Fri, 26 Jun 2015 00:02:26 +0300
Subject: [PATCH 2/4] Fixed some lines.

---
 lib/PayPal/Api/CreditCardHistory.php     | 4 ++--
 lib/PayPal/Core/PayPalHttpConnection.php | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/PayPal/Api/CreditCardHistory.php b/lib/PayPal/Api/CreditCardHistory.php
index 2c0874e..f8d0a94 100644
--- a/lib/PayPal/Api/CreditCardHistory.php
+++ b/lib/PayPal/Api/CreditCardHistory.php
@@ -11,7 +11,7 @@ use PayPal\Common\PayPalModel;
  *
  * @package PayPal\Api
  *
- * @property \PayPal\Api\CreditCard credit_cards
+ * @property \PayPal\Api\CreditCard[] credit_cards
  * @property int count
  * @property string next_id
  */
@@ -21,7 +21,7 @@ class CreditCardHistory extends PayPalModel
      * A list of credit card resources
      *
      *
-     * @param $credit_cards
+     * @param \PayPal\Api\CreditCard[] $credit_cards
      * @return $this
      */
     public function setCreditCards($credit_cards)
diff --git a/lib/PayPal/Core/PayPalHttpConnection.php b/lib/PayPal/Core/PayPalHttpConnection.php
index 251908a..ffc05d2 100644
--- a/lib/PayPal/Core/PayPalHttpConnection.php
+++ b/lib/PayPal/Core/PayPalHttpConnection.php
@@ -93,7 +93,6 @@ class PayPalHttpConnection
         switch ($this->httpConfig->getMethod()) {
             case 'POST':
                 curl_setopt($ch, CURLOPT_POST, true);
-                break;
             case 'PUT':
             case 'PATCH':
             case 'DELETE':

From 70fe1941ad168c0611d96ccefbd0539e7e5f0381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0rfan=20Evrens?= <irfanevrens@gmail.com>
Date: Fri, 26 Jun 2015 09:47:54 +0300
Subject: [PATCH 3/4] Fixed switch case logical problem.

---
 lib/PayPal/Core/PayPalHttpConnection.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/PayPal/Core/PayPalHttpConnection.php b/lib/PayPal/Core/PayPalHttpConnection.php
index ffc05d2..0cbe5aa 100644
--- a/lib/PayPal/Core/PayPalHttpConnection.php
+++ b/lib/PayPal/Core/PayPalHttpConnection.php
@@ -93,6 +93,8 @@ class PayPalHttpConnection
         switch ($this->httpConfig->getMethod()) {
             case 'POST':
                 curl_setopt($ch, CURLOPT_POST, true);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+                break;
             case 'PUT':
             case 'PATCH':
             case 'DELETE':

From aabcf9c2aacbbc8fc7d63320f19e5de9c639d596 Mon Sep 17 00:00:00 2001
From: Jay Patel <japatel@paypal.com>
Date: Tue, 30 Jun 2015 12:08:56 -0500
Subject: [PATCH 4/4] Formatting Fixes

- Fixed Imports
- Fixed Formatting
- Added Missing Documentation
---
 lib/PayPal/Api/BankAccount.php                   |  2 +-
 lib/PayPal/Api/Cost.php                          |  2 +-
 lib/PayPal/Api/CreditCard.php                    |  2 +-
 lib/PayPal/Api/Invoice.php                       |  2 +-
 lib/PayPal/Api/PaymentInstruction.php            |  2 +-
 lib/PayPal/Api/Payout.php                        |  2 +-
 lib/PayPal/Api/PayoutItem.php                    |  2 +-
 lib/PayPal/Api/Refund.php                        |  2 +-
 lib/PayPal/Api/WebhookEvent.php                  |  2 +-
 lib/PayPal/Auth/OAuthTokenCredential.php         |  2 +-
 lib/PayPal/Transport/PayPalRestCall.php          |  2 +-
 .../CreateBillingAgreementWithCreditCard.php     |  8 ++++----
 .../billing/CreateBillingAgreementWithPayPal.php |  2 +-
 sample/billing/CreatePlan.php                    |  8 ++++----
 sample/billing/UpdateBillingAgreement.php        |  2 +-
 sample/billing/UpdatePlan.php                    |  5 +++--
 sample/billing/UpdatePlanPaymentDefinitions.php  |  4 ++--
 sample/bootstrap.php                             |  2 +-
 sample/common.php                                |  8 --------
 sample/invoice/CancelInvoice.php                 |  2 +-
 sample/invoice/CreateInvoice.php                 | 16 ++++++++--------
 sample/invoice/DeleteInvoice.php                 |  1 -
 sample/invoice/RetrieveQRCode.php                |  1 -
 sample/lipp/GetUserInfo.php                      |  2 +-
 sample/notifications/SearchWebhookEvents.php     |  1 -
 sample/payments/AuthorizationCapture.php         |  2 +-
 sample/payments/AuthorizePayment.php             |  4 ++--
 sample/payments/CreateFuturePayment.php          |  3 ++-
 sample/payments/CreatePayment.php                |  4 ++--
 sample/payments/CreatePaymentUsingSavedCard.php  |  6 +++---
 sample/payments/GetAuthorization.php             |  1 -
 sample/payments/GetCapture.php                   |  2 --
 sample/payments/OrderAuthorize.php               |  1 -
 sample/payments/OrderCapture.php                 |  2 +-
 sample/payments/OrderDoVoid.php                  |  3 ---
 sample/payments/Reauthorization.php              |  2 +-
 sample/payments/RefundCapture.php                |  2 --
 sample/sale/GetSale.php                          |  2 +-
 tests/PayPal/Test/Api/AddressTest.php            |  1 -
 .../Test/Api/AgreementStateDescriptorTest.php    |  1 -
 tests/PayPal/Test/Api/AgreementTest.php          |  5 -----
 .../PayPal/Test/Api/AgreementTransactionTest.php |  1 -
 .../Test/Api/AgreementTransactionsTest.php       |  1 -
 tests/PayPal/Test/Api/AmountTest.php             |  3 ---
 tests/PayPal/Test/Api/AuthorizationTest.php      |  6 +-----
 tests/PayPal/Test/Api/BankAccountTest.php        |  4 ----
 tests/PayPal/Test/Api/BankAccountsListTest.php   |  1 -
 tests/PayPal/Test/Api/BankTokenTest.php          |  1 -
 tests/PayPal/Test/Api/BillingInfoTest.php        |  1 -
 tests/PayPal/Test/Api/CancelNotificationTest.php |  1 -
 tests/PayPal/Test/Api/CaptureTest.php            |  6 +-----
 .../PayPal/Test/Api/CarrierAccountTokenTest.php  |  1 -
 tests/PayPal/Test/Api/CartBaseTest.php           |  1 -
 tests/PayPal/Test/Api/ChargeModelTest.php        |  1 -
 tests/PayPal/Test/Api/CostTest.php               |  3 ---
 .../Test/Api/CreateProfileResponseTest.php       |  1 -
 tests/PayPal/Test/Api/CreditCardHistoryTest.php  |  5 +----
 tests/PayPal/Test/Api/CreditCardListTest.php     |  1 -
 tests/PayPal/Test/Api/CreditCardTest.php         |  6 +-----
 tests/PayPal/Test/Api/CreditCardTokenTest.php    |  1 -
 tests/PayPal/Test/Api/CreditTest.php             |  1 -
 tests/PayPal/Test/Api/CurrencyConversionTest.php |  1 -
 tests/PayPal/Test/Api/CurrencyTest.php           |  3 ---
 tests/PayPal/Test/Api/CustomAmountTest.php       |  1 -
 tests/PayPal/Test/Api/DetailsTest.php            |  3 ---
 tests/PayPal/Test/Api/ErrorDetailsTest.php       |  1 -
 tests/PayPal/Test/Api/ErrorTest.php              |  1 -
 .../PayPal/Test/Api/ExtendedBankAccountTest.php  |  1 -
 tests/PayPal/Test/Api/FlowConfigTest.php         |  1 -
 tests/PayPal/Test/Api/FmfDetailsTest.php         |  1 -
 tests/PayPal/Test/Api/FundingDetailTest.php      |  1 -
 tests/PayPal/Test/Api/FundingInstrumentTest.php  |  1 -
 tests/PayPal/Test/Api/FundingOptionTest.php      |  1 -
 tests/PayPal/Test/Api/FundingSourceTest.php      |  1 -
 tests/PayPal/Test/Api/HyperSchemaTest.php        |  1 -
 tests/PayPal/Test/Api/ImageTest.php              |  1 -
 tests/PayPal/Test/Api/IncentiveTest.php          |  1 -
 tests/PayPal/Test/Api/InputFieldsTest.php        |  1 -
 tests/PayPal/Test/Api/InstallmentInfoTest.php    |  1 -
 tests/PayPal/Test/Api/InstallmentOptionTest.php  |  1 -
 tests/PayPal/Test/Api/InvoiceAddressTest.php     |  1 -
 tests/PayPal/Test/Api/InvoiceItemTest.php        |  1 -
 .../Test/Api/InvoiceSearchResponseTest.php       |  1 -
 tests/PayPal/Test/Api/InvoiceTest.php            |  5 -----
 tests/PayPal/Test/Api/ItemListTest.php           |  1 -
 tests/PayPal/Test/Api/ItemTest.php               |  3 ---
 tests/PayPal/Test/Api/LinksTest.php              |  1 -
 tests/PayPal/Test/Api/MeasurementTest.php        |  1 -
 tests/PayPal/Test/Api/MerchantInfoTest.php       |  1 -
 .../PayPal/Test/Api/MerchantPreferencesTest.php  |  1 -
 tests/PayPal/Test/Api/MetadataTest.php           |  1 -
 tests/PayPal/Test/Api/NameValuePairTest.php      |  1 -
 tests/PayPal/Test/Api/NotificationTest.php       |  1 -
 tests/PayPal/Test/Api/OrderTest.php              |  6 +-----
 .../PayPal/Test/Api/OverrideChargeModelTest.php  |  1 -
 tests/PayPal/Test/Api/PatchRequestTest.php       |  1 -
 tests/PayPal/Test/Api/PatchTest.php              |  1 -
 tests/PayPal/Test/Api/PayeeTest.php              |  1 -
 tests/PayPal/Test/Api/PayerInfoTest.php          |  1 -
 tests/PayPal/Test/Api/PayerTest.php              |  1 -
 tests/PayPal/Test/Api/PaymentCardTest.php        |  1 -
 tests/PayPal/Test/Api/PaymentCardTokenTest.php   |  1 -
 tests/PayPal/Test/Api/PaymentDefinitionTest.php  |  1 -
 tests/PayPal/Test/Api/PaymentDetailTest.php      |  1 -
 tests/PayPal/Test/Api/PaymentExecutionTest.php   |  1 -
 tests/PayPal/Test/Api/PaymentHistoryTest.php     |  1 -
 tests/PayPal/Test/Api/PaymentInstructionTest.php |  5 +----
 tests/PayPal/Test/Api/PaymentOptionsTest.php     |  1 -
 tests/PayPal/Test/Api/PaymentTermTest.php        |  1 -
 tests/PayPal/Test/Api/PaymentTest.php            |  6 +-----
 tests/PayPal/Test/Api/PayoutBatchHeaderTest.php  |  1 -
 tests/PayPal/Test/Api/PayoutBatchTest.php        |  1 -
 tests/PayPal/Test/Api/PayoutItemDetailsTest.php  |  1 -
 tests/PayPal/Test/Api/PayoutItemTest.php         |  5 +----
 .../Test/Api/PayoutSenderBatchHeaderTest.php     |  1 -
 tests/PayPal/Test/Api/PhoneTest.php              |  1 -
 tests/PayPal/Test/Api/PlanListTest.php           |  1 -
 tests/PayPal/Test/Api/PlanTest.php               |  5 -----
 tests/PayPal/Test/Api/PresentationTest.php       |  1 -
 .../Test/Api/RecipientBankingInstructionTest.php |  1 -
 tests/PayPal/Test/Api/RedirectUrlsTest.php       |  1 -
 tests/PayPal/Test/Api/RefundDetailTest.php       |  1 -
 tests/PayPal/Test/Api/RefundTest.php             |  5 +----
 tests/PayPal/Test/Api/RelatedResourcesTest.php   |  1 -
 tests/PayPal/Test/Api/SaleTest.php               |  6 +-----
 tests/PayPal/Test/Api/SearchTest.php             |  1 -
 tests/PayPal/Test/Api/ShippingAddressTest.php    |  1 -
 tests/PayPal/Test/Api/ShippingCostTest.php       |  1 -
 tests/PayPal/Test/Api/ShippingInfoTest.php       |  1 -
 tests/PayPal/Test/Api/TaxTest.php                |  1 -
 tests/PayPal/Test/Api/TermsTest.php              |  1 -
 tests/PayPal/Test/Api/TransactionTest.php        |  1 -
 tests/PayPal/Test/Api/WebProfileTest.php         |  5 -----
 tests/PayPal/Test/Api/WebhookEventListTest.php   |  1 -
 tests/PayPal/Test/Api/WebhookEventTest.php       |  8 ++------
 .../PayPal/Test/Api/WebhookEventTypeListTest.php |  1 -
 tests/PayPal/Test/Api/WebhookEventTypeTest.php   |  5 -----
 tests/PayPal/Test/Api/WebhookListTest.php        |  1 -
 tests/PayPal/Test/Api/WebhookTest.php            |  5 -----
 .../Test/Auth/OAuthTokenCredentialTest.php       |  3 +--
 tests/PayPal/Test/Common/ChildClass.php          |  2 --
 tests/PayPal/Test/Common/FormatConverterTest.php |  2 +-
 .../Api/BillingPlansFunctionalTest.php           |  8 --------
 .../Functional/Api/PaymentsFunctionalTest.php    | 10 ----------
 .../Functional/Api/PayoutsFunctionalTest.php     |  7 -------
 .../Functional/Api/WebProfileFunctionalTest.php  |  8 ++------
 .../Functional/Api/WebhookFunctionalTest.php     | 12 ------------
 tests/PayPal/Test/Functional/Setup.php           |  1 -
 tests/PayPal/Test/Handler/OauthHandlerTest.php   |  5 ++---
 .../Test/Validation/NumericValidatorTest.php     |  1 -
 150 files changed, 68 insertions(+), 300 deletions(-)

diff --git a/lib/PayPal/Api/BankAccount.php b/lib/PayPal/Api/BankAccount.php
index 99750f1..34c0de0 100644
--- a/lib/PayPal/Api/BankAccount.php
+++ b/lib/PayPal/Api/BankAccount.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class BankAccount
diff --git a/lib/PayPal/Api/Cost.php b/lib/PayPal/Api/Cost.php
index b1e11a1..b8fa4ec 100644
--- a/lib/PayPal/Api/Cost.php
+++ b/lib/PayPal/Api/Cost.php
@@ -3,8 +3,8 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalModel;
-use PayPal\Validation\NumericValidator;
 use PayPal\Converter\FormatConverter;
+use PayPal\Validation\NumericValidator;
 
 /**
  * Class Cost
diff --git a/lib/PayPal/Api/CreditCard.php b/lib/PayPal/Api/CreditCard.php
index e528272..082d785 100644
--- a/lib/PayPal/Api/CreditCard.php
+++ b/lib/PayPal/Api/CreditCard.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
+use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
 use PayPal\Validation\ArgumentValidator;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class CreditCard
diff --git a/lib/PayPal/Api/Invoice.php b/lib/PayPal/Api/Invoice.php
index 85da974..df82c6e 100644
--- a/lib/PayPal/Api/Invoice.php
+++ b/lib/PayPal/Api/Invoice.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 use PayPal\Validation\UrlValidator;
 
 /**
diff --git a/lib/PayPal/Api/PaymentInstruction.php b/lib/PayPal/Api/PaymentInstruction.php
index 582487e..1222c31 100644
--- a/lib/PayPal/Api/PaymentInstruction.php
+++ b/lib/PayPal/Api/PaymentInstruction.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class PaymentInstruction
diff --git a/lib/PayPal/Api/Payout.php b/lib/PayPal/Api/Payout.php
index 44715da..b97b515 100644
--- a/lib/PayPal/Api/Payout.php
+++ b/lib/PayPal/Api/Payout.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
+use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
 use PayPal\Validation\ArgumentValidator;
-use PayPal\Rest\ApiContext;
 
 /**
  * Class Payout
diff --git a/lib/PayPal/Api/PayoutItem.php b/lib/PayPal/Api/PayoutItem.php
index 96723b8..76f2d23 100644
--- a/lib/PayPal/Api/PayoutItem.php
+++ b/lib/PayPal/Api/PayoutItem.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class PayoutItem
diff --git a/lib/PayPal/Api/Refund.php b/lib/PayPal/Api/Refund.php
index 9e62076..ee26a15 100644
--- a/lib/PayPal/Api/Refund.php
+++ b/lib/PayPal/Api/Refund.php
@@ -3,9 +3,9 @@
 namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 
 /**
  * Class Refund
diff --git a/lib/PayPal/Api/WebhookEvent.php b/lib/PayPal/Api/WebhookEvent.php
index 5c786f9..bc9426f 100644
--- a/lib/PayPal/Api/WebhookEvent.php
+++ b/lib/PayPal/Api/WebhookEvent.php
@@ -4,9 +4,9 @@ namespace PayPal\Api;
 
 use PayPal\Common\PayPalResourceModel;
 use PayPal\Exception\PayPalConnectionException;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Rest\ApiContext;
 use PayPal\Transport\PayPalRestCall;
+use PayPal\Validation\ArgumentValidator;
 use PayPal\Validation\JsonValidator;
 
 /**
diff --git a/lib/PayPal/Auth/OAuthTokenCredential.php b/lib/PayPal/Auth/OAuthTokenCredential.php
index 750ab7d..f1d9e60 100644
--- a/lib/PayPal/Auth/OAuthTokenCredential.php
+++ b/lib/PayPal/Auth/OAuthTokenCredential.php
@@ -205,7 +205,7 @@ class OAuthTokenCredential extends PayPalResourceModel
     /**
      * Updates Access Token based on given input
      *
-     * @param      $config
+     * @param array $config
      * @param string|null $refreshToken
      * @return string
      */
diff --git a/lib/PayPal/Transport/PayPalRestCall.php b/lib/PayPal/Transport/PayPalRestCall.php
index bf69f39..e80f5ec 100644
--- a/lib/PayPal/Transport/PayPalRestCall.php
+++ b/lib/PayPal/Transport/PayPalRestCall.php
@@ -1,9 +1,9 @@
 <?php
 namespace PayPal\Transport;
 
-use PayPal\Core\PayPalLoggingManager;
 use PayPal\Core\PayPalHttpConfig;
 use PayPal\Core\PayPalHttpConnection;
+use PayPal\Core\PayPalLoggingManager;
 use PayPal\Rest\ApiContext;
 
 /**
diff --git a/sample/billing/CreateBillingAgreementWithCreditCard.php b/sample/billing/CreateBillingAgreementWithCreditCard.php
index f0f1465..f0866b9 100644
--- a/sample/billing/CreateBillingAgreementWithCreditCard.php
+++ b/sample/billing/CreateBillingAgreementWithCreditCard.php
@@ -12,12 +12,12 @@
 $createdPlan = require 'UpdatePlan.php';
 
 use PayPal\Api\Agreement;
-use PayPal\Api\Plan;
-use PayPal\Api\Payer;
-use PayPal\Api\ShippingAddress;
-use PayPal\Api\PayerInfo;
 use PayPal\Api\CreditCard;
 use PayPal\Api\FundingInstrument;
+use PayPal\Api\Payer;
+use PayPal\Api\PayerInfo;
+use PayPal\Api\Plan;
+use PayPal\Api\ShippingAddress;
 
 /* Create a new instance of Agreement object
 {
diff --git a/sample/billing/CreateBillingAgreementWithPayPal.php b/sample/billing/CreateBillingAgreementWithPayPal.php
index a22bed0..f781267 100644
--- a/sample/billing/CreateBillingAgreementWithPayPal.php
+++ b/sample/billing/CreateBillingAgreementWithPayPal.php
@@ -12,8 +12,8 @@
 $createdPlan = require 'UpdatePlan.php';
 
 use PayPal\Api\Agreement;
-use PayPal\Api\Plan;
 use PayPal\Api\Payer;
+use PayPal\Api\Plan;
 use PayPal\Api\ShippingAddress;
 
 /* Create a new instance of Agreement object
diff --git a/sample/billing/CreatePlan.php b/sample/billing/CreatePlan.php
index 03e9105..1050efa 100644
--- a/sample/billing/CreatePlan.php
+++ b/sample/billing/CreatePlan.php
@@ -7,11 +7,11 @@
 // API used: /v1/payments/billing-plans
 
 require __DIR__ . '/../bootstrap.php';
-use PayPal\Api\Plan;
-use PayPal\Api\PaymentDefinition;
-use PayPal\Api\MerchantPreferences;
-use PayPal\Api\Currency;
 use PayPal\Api\ChargeModel;
+use PayPal\Api\Currency;
+use PayPal\Api\MerchantPreferences;
+use PayPal\Api\PaymentDefinition;
+use PayPal\Api\Plan;
 
 // Create a new instance of Plan object
 $plan = new Plan();
diff --git a/sample/billing/UpdateBillingAgreement.php b/sample/billing/UpdateBillingAgreement.php
index e79c026..ba8fb81 100644
--- a/sample/billing/UpdateBillingAgreement.php
+++ b/sample/billing/UpdateBillingAgreement.php
@@ -11,8 +11,8 @@
 $createdAgreement = require 'CreateBillingAgreementWithCreditCard.php';
 
 use PayPal\Api\Agreement;
-use PayPal\Api\PatchRequest;
 use PayPal\Api\Patch;
+use PayPal\Api\PatchRequest;
 
 $patch = new Patch();
 
diff --git a/sample/billing/UpdatePlan.php b/sample/billing/UpdatePlan.php
index bbdfae2..cfe2039 100644
--- a/sample/billing/UpdatePlan.php
+++ b/sample/billing/UpdatePlan.php
@@ -13,10 +13,11 @@
 /** @var Plan $createdPlan */
 $createdPlan = require 'CreatePlan.php';
 
-use PayPal\Api\Plan;
-use PayPal\Api\PatchRequest;
 use PayPal\Api\Patch;
+use PayPal\Api\PatchRequest;
+use PayPal\Api\Plan;
 use PayPal\Common\PayPalModel;
+
 try {
     $patch = new Patch();
 
diff --git a/sample/billing/UpdatePlanPaymentDefinitions.php b/sample/billing/UpdatePlanPaymentDefinitions.php
index e58a0f0..8132d6f 100644
--- a/sample/billing/UpdatePlanPaymentDefinitions.php
+++ b/sample/billing/UpdatePlanPaymentDefinitions.php
@@ -13,9 +13,9 @@
 /** @var Plan $createdPlan */
 $createdPlan = require 'CreatePlan.php';
 
-use PayPal\Api\Plan;
-use PayPal\Api\PatchRequest;
 use PayPal\Api\Patch;
+use PayPal\Api\PatchRequest;
+use PayPal\Api\Plan;
 
 try {
     $patch = new Patch();
diff --git a/sample/bootstrap.php b/sample/bootstrap.php
index 5aea334..763c5b6 100644
--- a/sample/bootstrap.php
+++ b/sample/bootstrap.php
@@ -19,8 +19,8 @@ if (!file_exists($composerAutoload)) {
 require $composerAutoload;
 require __DIR__ . '/common.php';
 
-use PayPal\Rest\ApiContext;
 use PayPal\Auth\OAuthTokenCredential;
+use PayPal\Rest\ApiContext;
 
 error_reporting(E_ALL);
 ini_set('display_errors', '1');
diff --git a/sample/common.php b/sample/common.php
index 7308aeb..8dd22ff 100644
--- a/sample/common.php
+++ b/sample/common.php
@@ -4,14 +4,6 @@
 	Common functions used across samples
 */
 
-use PayPal\Api\Address;
-use PayPal\Api\CreditCard;
-use PayPal\Api\Amount;
-use PayPal\Api\Payer;
-use PayPal\Api\Payment;
-use PayPal\Api\Transaction;
-use PayPal\Api\FundingInstrument;
-
 /**
  * Helper Class for Printing Results
  *
diff --git a/sample/invoice/CancelInvoice.php b/sample/invoice/CancelInvoice.php
index 366c528..82020a0 100644
--- a/sample/invoice/CancelInvoice.php
+++ b/sample/invoice/CancelInvoice.php
@@ -7,8 +7,8 @@
 /** @var Invoice $invoice */
 $invoice = require 'SendInvoice.php';
 
-use PayPal\Api\Invoice;
 use PayPal\Api\CancelNotification;
+use PayPal\Api\Invoice;
 
 try {
 
diff --git a/sample/invoice/CreateInvoice.php b/sample/invoice/CreateInvoice.php
index 7f39064..7e244fb 100644
--- a/sample/invoice/CreateInvoice.php
+++ b/sample/invoice/CreateInvoice.php
@@ -5,17 +5,17 @@
 // an invoice.
 
 require __DIR__ . '/../bootstrap.php';
-use PayPal\Api\Cost;
-use PayPal\Api\Invoice;
-use PayPal\Api\MerchantInfo;
-use PayPal\Api\BillingInfo;
-use PayPal\Api\InvoiceItem;
-use PayPal\Api\Phone;
 use PayPal\Api\Address;
+use PayPal\Api\BillingInfo;
+use PayPal\Api\Cost;
 use PayPal\Api\Currency;
-use PayPal\Api\PaymentTerm;
-use PayPal\Api\ShippingInfo;
+use PayPal\Api\Invoice;
 use PayPal\Api\InvoiceAddress;
+use PayPal\Api\InvoiceItem;
+use PayPal\Api\MerchantInfo;
+use PayPal\Api\PaymentTerm;
+use PayPal\Api\Phone;
+use PayPal\Api\ShippingInfo;
 
 $invoice = new Invoice();
 
diff --git a/sample/invoice/DeleteInvoice.php b/sample/invoice/DeleteInvoice.php
index 6063d64..7657b9d 100644
--- a/sample/invoice/DeleteInvoice.php
+++ b/sample/invoice/DeleteInvoice.php
@@ -8,7 +8,6 @@
 $invoice = require 'CreateInvoice.php';
 
 use PayPal\Api\Invoice;
-use PayPal\Api\CancelNotification;
 
 try {
 
diff --git a/sample/invoice/RetrieveQRCode.php b/sample/invoice/RetrieveQRCode.php
index d6081f3..e9cbd1d 100644
--- a/sample/invoice/RetrieveQRCode.php
+++ b/sample/invoice/RetrieveQRCode.php
@@ -7,7 +7,6 @@
 $invoice = require 'SendInvoice.php';
 
 use PayPal\Api\Invoice;
-use PayPal\Api\Notification;
 
 try {
 
diff --git a/sample/lipp/GetUserInfo.php b/sample/lipp/GetUserInfo.php
index 3bdae6c..52b8be7 100644
--- a/sample/lipp/GetUserInfo.php
+++ b/sample/lipp/GetUserInfo.php
@@ -3,8 +3,8 @@
 // ### Obtain Access Token From Refresh Token
 require __DIR__ . '/../bootstrap.php';
 
-use PayPal\Api\OpenIdUserinfo;
 use PayPal\Api\OpenIdTokeninfo;
+use PayPal\Api\OpenIdUserinfo;
 
 // To obtain User Info, you have to follow three steps in general.
 // First, you need to obtain user's consent to retrieve the information you want.
diff --git a/sample/notifications/SearchWebhookEvents.php b/sample/notifications/SearchWebhookEvents.php
index 2548abe..cabbc6a 100644
--- a/sample/notifications/SearchWebhookEvents.php
+++ b/sample/notifications/SearchWebhookEvents.php
@@ -12,7 +12,6 @@
 // for a webhook events. This is made in a sample just to make sure there is minimum of one webhook to listen to.
 /** @var \PayPal\Api\Webhook $webhook */
 $webhook = require __DIR__ . '/../bootstrap.php';
-use PayPal\Api\Authorization;
 
 $params = array(
    // 'start_time'=>'2014-12-06T11:00:00Z',
diff --git a/sample/payments/AuthorizationCapture.php b/sample/payments/AuthorizationCapture.php
index 606755a..493e4c5 100644
--- a/sample/payments/AuthorizationCapture.php
+++ b/sample/payments/AuthorizationCapture.php
@@ -8,8 +8,8 @@
 /** @var Authorization $authorization */
 $authorization = require 'GetAuthorization.php';
 use PayPal\Api\Amount;
-use PayPal\Api\Capture;
 use PayPal\Api\Authorization;
+use PayPal\Api\Capture;
 
 
 // ### Capture Payment
diff --git a/sample/payments/AuthorizePayment.php b/sample/payments/AuthorizePayment.php
index 5183624..c32b581 100644
--- a/sample/payments/AuthorizePayment.php
+++ b/sample/payments/AuthorizePayment.php
@@ -7,12 +7,12 @@
 require __DIR__ . '/../bootstrap.php';
 
 use PayPal\Api\Address;
+use PayPal\Api\Amount;
 use PayPal\Api\CreditCard;
 use PayPal\Api\FundingInstrument;
 use PayPal\Api\Payer;
-use PayPal\Api\Amount;
-use PayPal\Api\Transaction;
 use PayPal\Api\Payment;
+use PayPal\Api\Transaction;
 
 // The biggest difference between creating a payment, and authorizing a payment is to set the intent of payment
 // to correct setting. In this case, it would be 'authorize'
diff --git a/sample/payments/CreateFuturePayment.php b/sample/payments/CreateFuturePayment.php
index 9a6e579..0c1d31c 100644
--- a/sample/payments/CreateFuturePayment.php
+++ b/sample/payments/CreateFuturePayment.php
@@ -7,10 +7,11 @@
 
 require __DIR__ . '/../bootstrap.php';
 use PayPal\Api\Amount;
-use PayPal\Api\Payer;
 use PayPal\Api\FuturePayment;
+use PayPal\Api\Payer;
 use PayPal\Api\RedirectUrls;
 use PayPal\Api\Transaction;
+
 session_start();
 
 // ### Payer
diff --git a/sample/payments/CreatePayment.php b/sample/payments/CreatePayment.php
index d983834..c0317c7 100644
--- a/sample/payments/CreatePayment.php
+++ b/sample/payments/CreatePayment.php
@@ -10,13 +10,13 @@
 
 require __DIR__ . '/../bootstrap.php';
 use PayPal\Api\Amount;
+use PayPal\Api\CreditCard;
 use PayPal\Api\Details;
+use PayPal\Api\FundingInstrument;
 use PayPal\Api\Item;
 use PayPal\Api\ItemList;
-use PayPal\Api\CreditCard;
 use PayPal\Api\Payer;
 use PayPal\Api\Payment;
-use PayPal\Api\FundingInstrument;
 use PayPal\Api\Transaction;
 
 // ### CreditCard
diff --git a/sample/payments/CreatePaymentUsingSavedCard.php b/sample/payments/CreatePaymentUsingSavedCard.php
index e92d385..96f8512 100644
--- a/sample/payments/CreatePaymentUsingSavedCard.php
+++ b/sample/payments/CreatePaymentUsingSavedCard.php
@@ -8,15 +8,15 @@
 /** @var CreditCard $card */
 $card = require __DIR__ . '/../vault/CreateCreditCard.php';
 use PayPal\Api\Amount;
+use PayPal\Api\CreditCard;
+use PayPal\Api\CreditCardToken;
 use PayPal\Api\Details;
+use PayPal\Api\FundingInstrument;
 use PayPal\Api\Item;
 use PayPal\Api\ItemList;
-use PayPal\Api\CreditCardToken;
 use PayPal\Api\Payer;
 use PayPal\Api\Payment;
-use PayPal\Api\FundingInstrument;
 use PayPal\Api\Transaction;
-use PayPal\Api\CreditCard;
 
 // ### Credit card token
 // Saved credit card id from a previous call to
diff --git a/sample/payments/GetAuthorization.php b/sample/payments/GetAuthorization.php
index 426d906..6e423af 100644
--- a/sample/payments/GetAuthorization.php
+++ b/sample/payments/GetAuthorization.php
@@ -8,7 +8,6 @@
 $authorization = require 'AuthorizePayment.php';
 $authorizationId = $authorization->getId();
 use PayPal\Api\Authorization;
-use PayPal\Api\Payment;
 
 // ### GetAuthorization
 // You can retrieve info about an Authorization
diff --git a/sample/payments/GetCapture.php b/sample/payments/GetCapture.php
index fc64b4b..19cea3a 100644
--- a/sample/payments/GetCapture.php
+++ b/sample/payments/GetCapture.php
@@ -8,8 +8,6 @@
 $request = require 'AuthorizationCapture.php';
 
 use PayPal\Api\Capture;
-use PayPal\Api\Amount;
-use PayPal\Api\Authorization;
 
 // ### Retrieve Capture details
 // You can look up a capture by invoking the Capture::get method 
diff --git a/sample/payments/OrderAuthorize.php b/sample/payments/OrderAuthorize.php
index 05deb2e..441dfa9 100644
--- a/sample/payments/OrderAuthorize.php
+++ b/sample/payments/OrderAuthorize.php
@@ -6,7 +6,6 @@
 /** @var \PayPal\Api\Payment $payment */
 $payment = require __DIR__ . '/ExecutePayment.php';
 
-use PayPal\Api\Order;
 use PayPal\Api\Amount;
 use PayPal\Api\Authorization;
 
diff --git a/sample/payments/OrderCapture.php b/sample/payments/OrderCapture.php
index d4a3218..d704081 100644
--- a/sample/payments/OrderCapture.php
+++ b/sample/payments/OrderCapture.php
@@ -6,8 +6,8 @@
 /** @var \PayPal\Api\Payment $payment */
 $payment = require __DIR__ . '/ExecutePayment.php';
 
-use PayPal\Api\Capture;
 use PayPal\Api\Amount;
+use PayPal\Api\Capture;
 
 // ### Approval Status
 // Determine if the user approved the payment or not
diff --git a/sample/payments/OrderDoVoid.php b/sample/payments/OrderDoVoid.php
index f619418..7c0e287 100644
--- a/sample/payments/OrderDoVoid.php
+++ b/sample/payments/OrderDoVoid.php
@@ -7,9 +7,6 @@
 /** @var \PayPal\Api\Payment $payment */
 $payment = require __DIR__ . '/ExecutePayment.php';
 
-use PayPal\Api\Capture;
-use PayPal\Api\Amount;
-
 // ### Approval Status
 // Determine if the user approved the payment or not
 if (isset($_GET['success']) && $_GET['success'] == 'true') {
diff --git a/sample/payments/Reauthorization.php b/sample/payments/Reauthorization.php
index ab7c55c..dbebdfa 100644
--- a/sample/payments/Reauthorization.php
+++ b/sample/payments/Reauthorization.php
@@ -5,8 +5,8 @@
 // API used: v1/payments/authorization/{authorization_id}/reauthorize
 /** @var Authorization $authorization */
 $authorization = require 'AuthorizePayment.php';
-use PayPal\Api\Authorization;
 use PayPal\Api\Amount;
+use PayPal\Api\Authorization;
 
 // ### Reauthorization
 // Reauthorization is available only for PayPal account payments
diff --git a/sample/payments/RefundCapture.php b/sample/payments/RefundCapture.php
index d368c97..1ebbdaf 100644
--- a/sample/payments/RefundCapture.php
+++ b/sample/payments/RefundCapture.php
@@ -6,10 +6,8 @@
 /** @var Capture $capture */
 $capture = require 'AuthorizationCapture.php';
 
-use PayPal\Api\Authorization;
 use PayPal\Api\Capture;
 use PayPal\Api\Refund;
-use PayPal\Api\Amount;
 
 // ### Refund
 // Create a refund object indicating
diff --git a/sample/sale/GetSale.php b/sample/sale/GetSale.php
index 8efb72f..8b91501 100644
--- a/sample/sale/GetSale.php
+++ b/sample/sale/GetSale.php
@@ -8,8 +8,8 @@
 
 /** @var Payment $payment */
 $payment = require __DIR__ . '/../payments/CreatePayment.php';
-use PayPal\Api\Sale;
 use PayPal\Api\Payment;
+use PayPal\Api\Sale;
 
 // ### Get Sale From Created Payment
 // You can retrieve the sale Id from Related Resources for each transactions.
diff --git a/tests/PayPal/Test/Api/AddressTest.php b/tests/PayPal/Test/Api/AddressTest.php
index 4f675a9..c4ae25d 100644
--- a/tests/PayPal/Test/Api/AddressTest.php
+++ b/tests/PayPal/Test/Api/AddressTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Address;
 
 /**
diff --git a/tests/PayPal/Test/Api/AgreementStateDescriptorTest.php b/tests/PayPal/Test/Api/AgreementStateDescriptorTest.php
index 68508cb..3099606 100644
--- a/tests/PayPal/Test/Api/AgreementStateDescriptorTest.php
+++ b/tests/PayPal/Test/Api/AgreementStateDescriptorTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\AgreementStateDescriptor;
 
 /**
diff --git a/tests/PayPal/Test/Api/AgreementTest.php b/tests/PayPal/Test/Api/AgreementTest.php
index 0b5facb..2da2e72 100644
--- a/tests/PayPal/Test/Api/AgreementTest.php
+++ b/tests/PayPal/Test/Api/AgreementTest.php
@@ -2,11 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\AgreementTransactions;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\Agreement;
 
 /**
diff --git a/tests/PayPal/Test/Api/AgreementTransactionTest.php b/tests/PayPal/Test/Api/AgreementTransactionTest.php
index 64eeba7..47f02ca 100644
--- a/tests/PayPal/Test/Api/AgreementTransactionTest.php
+++ b/tests/PayPal/Test/Api/AgreementTransactionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\AgreementTransaction;
 
 /**
diff --git a/tests/PayPal/Test/Api/AgreementTransactionsTest.php b/tests/PayPal/Test/Api/AgreementTransactionsTest.php
index df96665..5d513d2 100644
--- a/tests/PayPal/Test/Api/AgreementTransactionsTest.php
+++ b/tests/PayPal/Test/Api/AgreementTransactionsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\AgreementTransactions;
 
 /**
diff --git a/tests/PayPal/Test/Api/AmountTest.php b/tests/PayPal/Test/Api/AmountTest.php
index c8015a7..5efd7d5 100644
--- a/tests/PayPal/Test/Api/AmountTest.php
+++ b/tests/PayPal/Test/Api/AmountTest.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Converter\FormatConverter;
-use PayPal\Validation\NumericValidator;
 use PayPal\Api\Amount;
 
 /**
diff --git a/tests/PayPal/Test/Api/AuthorizationTest.php b/tests/PayPal/Test/Api/AuthorizationTest.php
index cee2e8e..ef95265 100644
--- a/tests/PayPal/Test/Api/AuthorizationTest.php
+++ b/tests/PayPal/Test/Api/AuthorizationTest.php
@@ -2,12 +2,8 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Capture;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\Authorization;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class Authorization
diff --git a/tests/PayPal/Test/Api/BankAccountTest.php b/tests/PayPal/Test/Api/BankAccountTest.php
index 1607d99..0ca75a1 100644
--- a/tests/PayPal/Test/Api/BankAccountTest.php
+++ b/tests/PayPal/Test/Api/BankAccountTest.php
@@ -2,10 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\BankAccount;
 
 /**
diff --git a/tests/PayPal/Test/Api/BankAccountsListTest.php b/tests/PayPal/Test/Api/BankAccountsListTest.php
index 51d80ea..d834f3f 100644
--- a/tests/PayPal/Test/Api/BankAccountsListTest.php
+++ b/tests/PayPal/Test/Api/BankAccountsListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\BankAccountsList;
 
 /**
diff --git a/tests/PayPal/Test/Api/BankTokenTest.php b/tests/PayPal/Test/Api/BankTokenTest.php
index aa3de98..ff1dcb4 100644
--- a/tests/PayPal/Test/Api/BankTokenTest.php
+++ b/tests/PayPal/Test/Api/BankTokenTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\BankToken;
 
 /**
diff --git a/tests/PayPal/Test/Api/BillingInfoTest.php b/tests/PayPal/Test/Api/BillingInfoTest.php
index 2d7de85..540b937 100644
--- a/tests/PayPal/Test/Api/BillingInfoTest.php
+++ b/tests/PayPal/Test/Api/BillingInfoTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\BillingInfo;
 
 /**
diff --git a/tests/PayPal/Test/Api/CancelNotificationTest.php b/tests/PayPal/Test/Api/CancelNotificationTest.php
index d3c0376..6454cc2 100644
--- a/tests/PayPal/Test/Api/CancelNotificationTest.php
+++ b/tests/PayPal/Test/Api/CancelNotificationTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CancelNotification;
 
 /**
diff --git a/tests/PayPal/Test/Api/CaptureTest.php b/tests/PayPal/Test/Api/CaptureTest.php
index 2b2c74d..97aee4f 100644
--- a/tests/PayPal/Test/Api/CaptureTest.php
+++ b/tests/PayPal/Test/Api/CaptureTest.php
@@ -2,12 +2,8 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Refund;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\Capture;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class Capture
diff --git a/tests/PayPal/Test/Api/CarrierAccountTokenTest.php b/tests/PayPal/Test/Api/CarrierAccountTokenTest.php
index ec5298b..efc966d 100644
--- a/tests/PayPal/Test/Api/CarrierAccountTokenTest.php
+++ b/tests/PayPal/Test/Api/CarrierAccountTokenTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CarrierAccountToken;
 
 /**
diff --git a/tests/PayPal/Test/Api/CartBaseTest.php b/tests/PayPal/Test/Api/CartBaseTest.php
index 2105ea6..5d8161c 100644
--- a/tests/PayPal/Test/Api/CartBaseTest.php
+++ b/tests/PayPal/Test/Api/CartBaseTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CartBase;
 
 /**
diff --git a/tests/PayPal/Test/Api/ChargeModelTest.php b/tests/PayPal/Test/Api/ChargeModelTest.php
index ed78c22..46f4d2a 100644
--- a/tests/PayPal/Test/Api/ChargeModelTest.php
+++ b/tests/PayPal/Test/Api/ChargeModelTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ChargeModel;
 
 /**
diff --git a/tests/PayPal/Test/Api/CostTest.php b/tests/PayPal/Test/Api/CostTest.php
index 89f38df..61e3861 100644
--- a/tests/PayPal/Test/Api/CostTest.php
+++ b/tests/PayPal/Test/Api/CostTest.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Converter\FormatConverter;
-use PayPal\Validation\NumericValidator;
 use PayPal\Api\Cost;
 
 /**
diff --git a/tests/PayPal/Test/Api/CreateProfileResponseTest.php b/tests/PayPal/Test/Api/CreateProfileResponseTest.php
index 05f3f5e..ec2da48 100644
--- a/tests/PayPal/Test/Api/CreateProfileResponseTest.php
+++ b/tests/PayPal/Test/Api/CreateProfileResponseTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CreateProfileResponse;
 
 /**
diff --git a/tests/PayPal/Test/Api/CreditCardHistoryTest.php b/tests/PayPal/Test/Api/CreditCardHistoryTest.php
index d6b8409..14dd6a9 100644
--- a/tests/PayPal/Test/Api/CreditCardHistoryTest.php
+++ b/tests/PayPal/Test/Api/CreditCardHistoryTest.php
@@ -1,11 +1,8 @@
 <?php
 namespace PayPal\Test\Api;
 
-use PayPal\Api\CreditCardHistory;
-
-use PayPal\Api\Address;
 use PayPal\Api\CreditCard;
-use PayPal\Test\Constants;
+use PayPal\Api\CreditCardHistory;
 
 class CreditCardHistoryTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PayPal/Test/Api/CreditCardListTest.php b/tests/PayPal/Test/Api/CreditCardListTest.php
index c52cb7d..3a266c9 100644
--- a/tests/PayPal/Test/Api/CreditCardListTest.php
+++ b/tests/PayPal/Test/Api/CreditCardListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CreditCardList;
 
 /**
diff --git a/tests/PayPal/Test/Api/CreditCardTest.php b/tests/PayPal/Test/Api/CreditCardTest.php
index ace0002..0a6e485 100644
--- a/tests/PayPal/Test/Api/CreditCardTest.php
+++ b/tests/PayPal/Test/Api/CreditCardTest.php
@@ -2,12 +2,8 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\CreditCardList;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\CreditCard;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class CreditCard
diff --git a/tests/PayPal/Test/Api/CreditCardTokenTest.php b/tests/PayPal/Test/Api/CreditCardTokenTest.php
index f6cb7c8..a610878 100644
--- a/tests/PayPal/Test/Api/CreditCardTokenTest.php
+++ b/tests/PayPal/Test/Api/CreditCardTokenTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CreditCardToken;
 
 /**
diff --git a/tests/PayPal/Test/Api/CreditTest.php b/tests/PayPal/Test/Api/CreditTest.php
index 966ffa0..e058bd6 100644
--- a/tests/PayPal/Test/Api/CreditTest.php
+++ b/tests/PayPal/Test/Api/CreditTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Credit;
 
 /**
diff --git a/tests/PayPal/Test/Api/CurrencyConversionTest.php b/tests/PayPal/Test/Api/CurrencyConversionTest.php
index e8092fb..2aea917 100644
--- a/tests/PayPal/Test/Api/CurrencyConversionTest.php
+++ b/tests/PayPal/Test/Api/CurrencyConversionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CurrencyConversion;
 
 /**
diff --git a/tests/PayPal/Test/Api/CurrencyTest.php b/tests/PayPal/Test/Api/CurrencyTest.php
index 003da0d..478dcc5 100644
--- a/tests/PayPal/Test/Api/CurrencyTest.php
+++ b/tests/PayPal/Test/Api/CurrencyTest.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Converter\FormatConverter;
-use PayPal\Validation\NumericValidator;
 use PayPal\Api\Currency;
 
 /**
diff --git a/tests/PayPal/Test/Api/CustomAmountTest.php b/tests/PayPal/Test/Api/CustomAmountTest.php
index fa765f5..1b8d1a4 100644
--- a/tests/PayPal/Test/Api/CustomAmountTest.php
+++ b/tests/PayPal/Test/Api/CustomAmountTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\CustomAmount;
 
 /**
diff --git a/tests/PayPal/Test/Api/DetailsTest.php b/tests/PayPal/Test/Api/DetailsTest.php
index f08c0d9..4d55ac8 100644
--- a/tests/PayPal/Test/Api/DetailsTest.php
+++ b/tests/PayPal/Test/Api/DetailsTest.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Converter\FormatConverter;
-use PayPal\Validation\NumericValidator;
 use PayPal\Api\Details;
 
 /**
diff --git a/tests/PayPal/Test/Api/ErrorDetailsTest.php b/tests/PayPal/Test/Api/ErrorDetailsTest.php
index 395eaac..852c349 100644
--- a/tests/PayPal/Test/Api/ErrorDetailsTest.php
+++ b/tests/PayPal/Test/Api/ErrorDetailsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ErrorDetails;
 
 /**
diff --git a/tests/PayPal/Test/Api/ErrorTest.php b/tests/PayPal/Test/Api/ErrorTest.php
index 3de79ea..bd00f11 100644
--- a/tests/PayPal/Test/Api/ErrorTest.php
+++ b/tests/PayPal/Test/Api/ErrorTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Error;
 
 /**
diff --git a/tests/PayPal/Test/Api/ExtendedBankAccountTest.php b/tests/PayPal/Test/Api/ExtendedBankAccountTest.php
index 7a8d83e..689a625 100644
--- a/tests/PayPal/Test/Api/ExtendedBankAccountTest.php
+++ b/tests/PayPal/Test/Api/ExtendedBankAccountTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ExtendedBankAccount;
 
 /**
diff --git a/tests/PayPal/Test/Api/FlowConfigTest.php b/tests/PayPal/Test/Api/FlowConfigTest.php
index 5c47b90..7644839 100644
--- a/tests/PayPal/Test/Api/FlowConfigTest.php
+++ b/tests/PayPal/Test/Api/FlowConfigTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\FlowConfig;
 
 /**
diff --git a/tests/PayPal/Test/Api/FmfDetailsTest.php b/tests/PayPal/Test/Api/FmfDetailsTest.php
index 4e11a13..bf81b4a 100644
--- a/tests/PayPal/Test/Api/FmfDetailsTest.php
+++ b/tests/PayPal/Test/Api/FmfDetailsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\FmfDetails;
 
 /**
diff --git a/tests/PayPal/Test/Api/FundingDetailTest.php b/tests/PayPal/Test/Api/FundingDetailTest.php
index 928b0b5..5f3b880 100644
--- a/tests/PayPal/Test/Api/FundingDetailTest.php
+++ b/tests/PayPal/Test/Api/FundingDetailTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\FundingDetail;
 
 /**
diff --git a/tests/PayPal/Test/Api/FundingInstrumentTest.php b/tests/PayPal/Test/Api/FundingInstrumentTest.php
index d64ca5b..4148098 100644
--- a/tests/PayPal/Test/Api/FundingInstrumentTest.php
+++ b/tests/PayPal/Test/Api/FundingInstrumentTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\FundingInstrument;
 
 /**
diff --git a/tests/PayPal/Test/Api/FundingOptionTest.php b/tests/PayPal/Test/Api/FundingOptionTest.php
index 2c561bd..e11c7a9 100644
--- a/tests/PayPal/Test/Api/FundingOptionTest.php
+++ b/tests/PayPal/Test/Api/FundingOptionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\FundingOption;
 
 /**
diff --git a/tests/PayPal/Test/Api/FundingSourceTest.php b/tests/PayPal/Test/Api/FundingSourceTest.php
index 809b03e..c8f0616 100644
--- a/tests/PayPal/Test/Api/FundingSourceTest.php
+++ b/tests/PayPal/Test/Api/FundingSourceTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\FundingSource;
 
 /**
diff --git a/tests/PayPal/Test/Api/HyperSchemaTest.php b/tests/PayPal/Test/Api/HyperSchemaTest.php
index a9be72a..c53772e 100644
--- a/tests/PayPal/Test/Api/HyperSchemaTest.php
+++ b/tests/PayPal/Test/Api/HyperSchemaTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\HyperSchema;
 
 /**
diff --git a/tests/PayPal/Test/Api/ImageTest.php b/tests/PayPal/Test/Api/ImageTest.php
index f96901d..6af355c 100644
--- a/tests/PayPal/Test/Api/ImageTest.php
+++ b/tests/PayPal/Test/Api/ImageTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Image;
 
 /**
diff --git a/tests/PayPal/Test/Api/IncentiveTest.php b/tests/PayPal/Test/Api/IncentiveTest.php
index 7610836..61f77e0 100644
--- a/tests/PayPal/Test/Api/IncentiveTest.php
+++ b/tests/PayPal/Test/Api/IncentiveTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Incentive;
 
 /**
diff --git a/tests/PayPal/Test/Api/InputFieldsTest.php b/tests/PayPal/Test/Api/InputFieldsTest.php
index cef0319..588f89c 100644
--- a/tests/PayPal/Test/Api/InputFieldsTest.php
+++ b/tests/PayPal/Test/Api/InputFieldsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\InputFields;
 
 /**
diff --git a/tests/PayPal/Test/Api/InstallmentInfoTest.php b/tests/PayPal/Test/Api/InstallmentInfoTest.php
index 665e1db..0768a90 100644
--- a/tests/PayPal/Test/Api/InstallmentInfoTest.php
+++ b/tests/PayPal/Test/Api/InstallmentInfoTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\InstallmentInfo;
 
 /**
diff --git a/tests/PayPal/Test/Api/InstallmentOptionTest.php b/tests/PayPal/Test/Api/InstallmentOptionTest.php
index a9c04c6..10005a3 100644
--- a/tests/PayPal/Test/Api/InstallmentOptionTest.php
+++ b/tests/PayPal/Test/Api/InstallmentOptionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\InstallmentOption;
 
 /**
diff --git a/tests/PayPal/Test/Api/InvoiceAddressTest.php b/tests/PayPal/Test/Api/InvoiceAddressTest.php
index dd47fc2..257f3de 100644
--- a/tests/PayPal/Test/Api/InvoiceAddressTest.php
+++ b/tests/PayPal/Test/Api/InvoiceAddressTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\InvoiceAddress;
 
 /**
diff --git a/tests/PayPal/Test/Api/InvoiceItemTest.php b/tests/PayPal/Test/Api/InvoiceItemTest.php
index 15e0e6c..372e58c 100644
--- a/tests/PayPal/Test/Api/InvoiceItemTest.php
+++ b/tests/PayPal/Test/Api/InvoiceItemTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\InvoiceItem;
 
 /**
diff --git a/tests/PayPal/Test/Api/InvoiceSearchResponseTest.php b/tests/PayPal/Test/Api/InvoiceSearchResponseTest.php
index 3d1503d..cbba180 100644
--- a/tests/PayPal/Test/Api/InvoiceSearchResponseTest.php
+++ b/tests/PayPal/Test/Api/InvoiceSearchResponseTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\InvoiceSearchResponse;
 
 /**
diff --git a/tests/PayPal/Test/Api/InvoiceTest.php b/tests/PayPal/Test/Api/InvoiceTest.php
index 1c07242..410f60a 100644
--- a/tests/PayPal/Test/Api/InvoiceTest.php
+++ b/tests/PayPal/Test/Api/InvoiceTest.php
@@ -2,11 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\InvoiceSearchResponse;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\Invoice;
 
 /**
diff --git a/tests/PayPal/Test/Api/ItemListTest.php b/tests/PayPal/Test/Api/ItemListTest.php
index 4bef41b..a17aa14 100644
--- a/tests/PayPal/Test/Api/ItemListTest.php
+++ b/tests/PayPal/Test/Api/ItemListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ItemList;
 
 /**
diff --git a/tests/PayPal/Test/Api/ItemTest.php b/tests/PayPal/Test/Api/ItemTest.php
index 5294cea..a50daf6 100644
--- a/tests/PayPal/Test/Api/ItemTest.php
+++ b/tests/PayPal/Test/Api/ItemTest.php
@@ -2,9 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
-use PayPal\Converter\FormatConverter;
-use PayPal\Validation\NumericValidator;
 use PayPal\Api\Item;
 
 /**
diff --git a/tests/PayPal/Test/Api/LinksTest.php b/tests/PayPal/Test/Api/LinksTest.php
index d9b23c3..f8d008a 100644
--- a/tests/PayPal/Test/Api/LinksTest.php
+++ b/tests/PayPal/Test/Api/LinksTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Links;
 
 /**
diff --git a/tests/PayPal/Test/Api/MeasurementTest.php b/tests/PayPal/Test/Api/MeasurementTest.php
index fafca36..12a2606 100644
--- a/tests/PayPal/Test/Api/MeasurementTest.php
+++ b/tests/PayPal/Test/Api/MeasurementTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Measurement;
 
 /**
diff --git a/tests/PayPal/Test/Api/MerchantInfoTest.php b/tests/PayPal/Test/Api/MerchantInfoTest.php
index 56da4fd..8801722 100644
--- a/tests/PayPal/Test/Api/MerchantInfoTest.php
+++ b/tests/PayPal/Test/Api/MerchantInfoTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\MerchantInfo;
 
 /**
diff --git a/tests/PayPal/Test/Api/MerchantPreferencesTest.php b/tests/PayPal/Test/Api/MerchantPreferencesTest.php
index 4583e1c..513925d 100644
--- a/tests/PayPal/Test/Api/MerchantPreferencesTest.php
+++ b/tests/PayPal/Test/Api/MerchantPreferencesTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\MerchantPreferences;
 
 /**
diff --git a/tests/PayPal/Test/Api/MetadataTest.php b/tests/PayPal/Test/Api/MetadataTest.php
index 47f2835..1e85fee 100644
--- a/tests/PayPal/Test/Api/MetadataTest.php
+++ b/tests/PayPal/Test/Api/MetadataTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Metadata;
 
 /**
diff --git a/tests/PayPal/Test/Api/NameValuePairTest.php b/tests/PayPal/Test/Api/NameValuePairTest.php
index eab2e79..117bcf9 100644
--- a/tests/PayPal/Test/Api/NameValuePairTest.php
+++ b/tests/PayPal/Test/Api/NameValuePairTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\NameValuePair;
 
 /**
diff --git a/tests/PayPal/Test/Api/NotificationTest.php b/tests/PayPal/Test/Api/NotificationTest.php
index a89e6f4..eb0b91d 100644
--- a/tests/PayPal/Test/Api/NotificationTest.php
+++ b/tests/PayPal/Test/Api/NotificationTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Notification;
 
 /**
diff --git a/tests/PayPal/Test/Api/OrderTest.php b/tests/PayPal/Test/Api/OrderTest.php
index ed728e1..d5295c8 100644
--- a/tests/PayPal/Test/Api/OrderTest.php
+++ b/tests/PayPal/Test/Api/OrderTest.php
@@ -2,13 +2,9 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Capture;
 use PayPal\Api\Authorization;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\Order;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class Order
diff --git a/tests/PayPal/Test/Api/OverrideChargeModelTest.php b/tests/PayPal/Test/Api/OverrideChargeModelTest.php
index 4271fc9..4492418 100644
--- a/tests/PayPal/Test/Api/OverrideChargeModelTest.php
+++ b/tests/PayPal/Test/Api/OverrideChargeModelTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\OverrideChargeModel;
 
 /**
diff --git a/tests/PayPal/Test/Api/PatchRequestTest.php b/tests/PayPal/Test/Api/PatchRequestTest.php
index d14c040..12629d2 100644
--- a/tests/PayPal/Test/Api/PatchRequestTest.php
+++ b/tests/PayPal/Test/Api/PatchRequestTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PatchRequest;
 
 /**
diff --git a/tests/PayPal/Test/Api/PatchTest.php b/tests/PayPal/Test/Api/PatchTest.php
index 42e0855..639cf13 100644
--- a/tests/PayPal/Test/Api/PatchTest.php
+++ b/tests/PayPal/Test/Api/PatchTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Patch;
 
 /**
diff --git a/tests/PayPal/Test/Api/PayeeTest.php b/tests/PayPal/Test/Api/PayeeTest.php
index 62d8c9e..a6a0eaa 100644
--- a/tests/PayPal/Test/Api/PayeeTest.php
+++ b/tests/PayPal/Test/Api/PayeeTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Payee;
 
 /**
diff --git a/tests/PayPal/Test/Api/PayerInfoTest.php b/tests/PayPal/Test/Api/PayerInfoTest.php
index a5930b6..2f1917e 100644
--- a/tests/PayPal/Test/Api/PayerInfoTest.php
+++ b/tests/PayPal/Test/Api/PayerInfoTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PayerInfo;
 
 /**
diff --git a/tests/PayPal/Test/Api/PayerTest.php b/tests/PayPal/Test/Api/PayerTest.php
index 7aeb9d6..209313c 100644
--- a/tests/PayPal/Test/Api/PayerTest.php
+++ b/tests/PayPal/Test/Api/PayerTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Payer;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentCardTest.php b/tests/PayPal/Test/Api/PaymentCardTest.php
index 19fe8a8..a375f31 100644
--- a/tests/PayPal/Test/Api/PaymentCardTest.php
+++ b/tests/PayPal/Test/Api/PaymentCardTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentCard;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentCardTokenTest.php b/tests/PayPal/Test/Api/PaymentCardTokenTest.php
index 2001330..43f6a5c 100644
--- a/tests/PayPal/Test/Api/PaymentCardTokenTest.php
+++ b/tests/PayPal/Test/Api/PaymentCardTokenTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentCardToken;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentDefinitionTest.php b/tests/PayPal/Test/Api/PaymentDefinitionTest.php
index fee1bbd..2043b8e 100644
--- a/tests/PayPal/Test/Api/PaymentDefinitionTest.php
+++ b/tests/PayPal/Test/Api/PaymentDefinitionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentDefinition;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentDetailTest.php b/tests/PayPal/Test/Api/PaymentDetailTest.php
index fe0aa76..fa2e42a 100644
--- a/tests/PayPal/Test/Api/PaymentDetailTest.php
+++ b/tests/PayPal/Test/Api/PaymentDetailTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentDetail;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentExecutionTest.php b/tests/PayPal/Test/Api/PaymentExecutionTest.php
index d378198..996674e 100644
--- a/tests/PayPal/Test/Api/PaymentExecutionTest.php
+++ b/tests/PayPal/Test/Api/PaymentExecutionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentExecution;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentHistoryTest.php b/tests/PayPal/Test/Api/PaymentHistoryTest.php
index fba25e2..592c30c 100644
--- a/tests/PayPal/Test/Api/PaymentHistoryTest.php
+++ b/tests/PayPal/Test/Api/PaymentHistoryTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentHistory;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentInstructionTest.php b/tests/PayPal/Test/Api/PaymentInstructionTest.php
index ad82cd5..d153d35 100644
--- a/tests/PayPal/Test/Api/PaymentInstructionTest.php
+++ b/tests/PayPal/Test/Api/PaymentInstructionTest.php
@@ -2,11 +2,8 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\PaymentInstruction;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class PaymentInstruction
diff --git a/tests/PayPal/Test/Api/PaymentOptionsTest.php b/tests/PayPal/Test/Api/PaymentOptionsTest.php
index 35d6c1c..572375f 100644
--- a/tests/PayPal/Test/Api/PaymentOptionsTest.php
+++ b/tests/PayPal/Test/Api/PaymentOptionsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentOptions;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentTermTest.php b/tests/PayPal/Test/Api/PaymentTermTest.php
index fcddfee..24e9102 100644
--- a/tests/PayPal/Test/Api/PaymentTermTest.php
+++ b/tests/PayPal/Test/Api/PaymentTermTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PaymentTerm;
 
 /**
diff --git a/tests/PayPal/Test/Api/PaymentTest.php b/tests/PayPal/Test/Api/PaymentTest.php
index 2d19474..783c234 100644
--- a/tests/PayPal/Test/Api/PaymentTest.php
+++ b/tests/PayPal/Test/Api/PaymentTest.php
@@ -2,13 +2,9 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Api\object;
-use PayPal\Api\PaymentHistory;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\Payment;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class Payment
diff --git a/tests/PayPal/Test/Api/PayoutBatchHeaderTest.php b/tests/PayPal/Test/Api/PayoutBatchHeaderTest.php
index 8f8cca5..1f96f67 100644
--- a/tests/PayPal/Test/Api/PayoutBatchHeaderTest.php
+++ b/tests/PayPal/Test/Api/PayoutBatchHeaderTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PayoutBatchHeader;
 
 /**
diff --git a/tests/PayPal/Test/Api/PayoutBatchTest.php b/tests/PayPal/Test/Api/PayoutBatchTest.php
index bf7c9c2..5b22a8a 100644
--- a/tests/PayPal/Test/Api/PayoutBatchTest.php
+++ b/tests/PayPal/Test/Api/PayoutBatchTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PayoutBatch;
 
 /**
diff --git a/tests/PayPal/Test/Api/PayoutItemDetailsTest.php b/tests/PayPal/Test/Api/PayoutItemDetailsTest.php
index 64a02a1..46adfef 100644
--- a/tests/PayPal/Test/Api/PayoutItemDetailsTest.php
+++ b/tests/PayPal/Test/Api/PayoutItemDetailsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PayoutItemDetails;
 
 /**
diff --git a/tests/PayPal/Test/Api/PayoutItemTest.php b/tests/PayPal/Test/Api/PayoutItemTest.php
index 1a5a217..f15d884 100644
--- a/tests/PayPal/Test/Api/PayoutItemTest.php
+++ b/tests/PayPal/Test/Api/PayoutItemTest.php
@@ -2,12 +2,9 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
 use PayPal\Api\ItemsArray;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\PayoutItem;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class PayoutItem
diff --git a/tests/PayPal/Test/Api/PayoutSenderBatchHeaderTest.php b/tests/PayPal/Test/Api/PayoutSenderBatchHeaderTest.php
index f3fbf0f..64617ef 100644
--- a/tests/PayPal/Test/Api/PayoutSenderBatchHeaderTest.php
+++ b/tests/PayPal/Test/Api/PayoutSenderBatchHeaderTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PayoutSenderBatchHeader;
 
 /**
diff --git a/tests/PayPal/Test/Api/PhoneTest.php b/tests/PayPal/Test/Api/PhoneTest.php
index 0f6930c..8eca256 100644
--- a/tests/PayPal/Test/Api/PhoneTest.php
+++ b/tests/PayPal/Test/Api/PhoneTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Phone;
 
 /**
diff --git a/tests/PayPal/Test/Api/PlanListTest.php b/tests/PayPal/Test/Api/PlanListTest.php
index 3301e57..aa4954c 100644
--- a/tests/PayPal/Test/Api/PlanListTest.php
+++ b/tests/PayPal/Test/Api/PlanListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\PlanList;
 
 /**
diff --git a/tests/PayPal/Test/Api/PlanTest.php b/tests/PayPal/Test/Api/PlanTest.php
index 82ba1bb..bb78481 100644
--- a/tests/PayPal/Test/Api/PlanTest.php
+++ b/tests/PayPal/Test/Api/PlanTest.php
@@ -2,11 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\PlanList;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\Plan;
 
 /**
diff --git a/tests/PayPal/Test/Api/PresentationTest.php b/tests/PayPal/Test/Api/PresentationTest.php
index debef88..2807f49 100644
--- a/tests/PayPal/Test/Api/PresentationTest.php
+++ b/tests/PayPal/Test/Api/PresentationTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Presentation;
 
 /**
diff --git a/tests/PayPal/Test/Api/RecipientBankingInstructionTest.php b/tests/PayPal/Test/Api/RecipientBankingInstructionTest.php
index 2b823c6..93c481c 100644
--- a/tests/PayPal/Test/Api/RecipientBankingInstructionTest.php
+++ b/tests/PayPal/Test/Api/RecipientBankingInstructionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\RecipientBankingInstruction;
 
 /**
diff --git a/tests/PayPal/Test/Api/RedirectUrlsTest.php b/tests/PayPal/Test/Api/RedirectUrlsTest.php
index 41435f5..ed149e6 100644
--- a/tests/PayPal/Test/Api/RedirectUrlsTest.php
+++ b/tests/PayPal/Test/Api/RedirectUrlsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\RedirectUrls;
 
 /**
diff --git a/tests/PayPal/Test/Api/RefundDetailTest.php b/tests/PayPal/Test/Api/RefundDetailTest.php
index 6ccd4f6..3bf0bd8 100644
--- a/tests/PayPal/Test/Api/RefundDetailTest.php
+++ b/tests/PayPal/Test/Api/RefundDetailTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\RefundDetail;
 
 /**
diff --git a/tests/PayPal/Test/Api/RefundTest.php b/tests/PayPal/Test/Api/RefundTest.php
index a396063..1848cfe 100644
--- a/tests/PayPal/Test/Api/RefundTest.php
+++ b/tests/PayPal/Test/Api/RefundTest.php
@@ -2,11 +2,8 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\Refund;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class Refund
diff --git a/tests/PayPal/Test/Api/RelatedResourcesTest.php b/tests/PayPal/Test/Api/RelatedResourcesTest.php
index 461a00e..e4688b5 100644
--- a/tests/PayPal/Test/Api/RelatedResourcesTest.php
+++ b/tests/PayPal/Test/Api/RelatedResourcesTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\RelatedResources;
 
 /**
diff --git a/tests/PayPal/Test/Api/SaleTest.php b/tests/PayPal/Test/Api/SaleTest.php
index 60c2da7..6553d7b 100644
--- a/tests/PayPal/Test/Api/SaleTest.php
+++ b/tests/PayPal/Test/Api/SaleTest.php
@@ -2,12 +2,8 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\Refund;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PPRestCall;
 use PayPal\Api\Sale;
+use PayPal\Transport\PPRestCall;
 
 /**
  * Class Sale
diff --git a/tests/PayPal/Test/Api/SearchTest.php b/tests/PayPal/Test/Api/SearchTest.php
index d5495b8..4c9c432 100644
--- a/tests/PayPal/Test/Api/SearchTest.php
+++ b/tests/PayPal/Test/Api/SearchTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Search;
 
 /**
diff --git a/tests/PayPal/Test/Api/ShippingAddressTest.php b/tests/PayPal/Test/Api/ShippingAddressTest.php
index bbe02b0..95a294a 100644
--- a/tests/PayPal/Test/Api/ShippingAddressTest.php
+++ b/tests/PayPal/Test/Api/ShippingAddressTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ShippingAddress;
 
 /**
diff --git a/tests/PayPal/Test/Api/ShippingCostTest.php b/tests/PayPal/Test/Api/ShippingCostTest.php
index 8cbf446..f146cf8 100644
--- a/tests/PayPal/Test/Api/ShippingCostTest.php
+++ b/tests/PayPal/Test/Api/ShippingCostTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ShippingCost;
 
 /**
diff --git a/tests/PayPal/Test/Api/ShippingInfoTest.php b/tests/PayPal/Test/Api/ShippingInfoTest.php
index 1ac4e2d..dd92c29 100644
--- a/tests/PayPal/Test/Api/ShippingInfoTest.php
+++ b/tests/PayPal/Test/Api/ShippingInfoTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\ShippingInfo;
 
 /**
diff --git a/tests/PayPal/Test/Api/TaxTest.php b/tests/PayPal/Test/Api/TaxTest.php
index bd75a8b..9029bf4 100644
--- a/tests/PayPal/Test/Api/TaxTest.php
+++ b/tests/PayPal/Test/Api/TaxTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Tax;
 
 /**
diff --git a/tests/PayPal/Test/Api/TermsTest.php b/tests/PayPal/Test/Api/TermsTest.php
index c835d34..4df7938 100644
--- a/tests/PayPal/Test/Api/TermsTest.php
+++ b/tests/PayPal/Test/Api/TermsTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Terms;
 
 /**
diff --git a/tests/PayPal/Test/Api/TransactionTest.php b/tests/PayPal/Test/Api/TransactionTest.php
index 3644ec2..7852a05 100644
--- a/tests/PayPal/Test/Api/TransactionTest.php
+++ b/tests/PayPal/Test/Api/TransactionTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\Transaction;
 
 /**
diff --git a/tests/PayPal/Test/Api/WebProfileTest.php b/tests/PayPal/Test/Api/WebProfileTest.php
index ad276c0..1cad9ee 100644
--- a/tests/PayPal/Test/Api/WebProfileTest.php
+++ b/tests/PayPal/Test/Api/WebProfileTest.php
@@ -2,11 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\CreateProfileResponse;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\WebProfile;
 
 /**
diff --git a/tests/PayPal/Test/Api/WebhookEventListTest.php b/tests/PayPal/Test/Api/WebhookEventListTest.php
index aae8b9a..611a4b2 100644
--- a/tests/PayPal/Test/Api/WebhookEventListTest.php
+++ b/tests/PayPal/Test/Api/WebhookEventListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\WebhookEventList;
 
 /**
diff --git a/tests/PayPal/Test/Api/WebhookEventTest.php b/tests/PayPal/Test/Api/WebhookEventTest.php
index 8f172b1..3631e9d 100644
--- a/tests/PayPal/Test/Api/WebhookEventTest.php
+++ b/tests/PayPal/Test/Api/WebhookEventTest.php
@@ -2,13 +2,9 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Exception\PayPalConnectionException;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookEventList;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\WebhookEvent;
+use PayPal\Exception\PayPalConnectionException;
+use PayPal\Rest\ApiContext;
 
 /**
  * Class WebhookEvent
diff --git a/tests/PayPal/Test/Api/WebhookEventTypeListTest.php b/tests/PayPal/Test/Api/WebhookEventTypeListTest.php
index a38a52c..baa569d 100644
--- a/tests/PayPal/Test/Api/WebhookEventTypeListTest.php
+++ b/tests/PayPal/Test/Api/WebhookEventTypeListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\WebhookEventTypeList;
 
 /**
diff --git a/tests/PayPal/Test/Api/WebhookEventTypeTest.php b/tests/PayPal/Test/Api/WebhookEventTypeTest.php
index f107209..70ec286 100644
--- a/tests/PayPal/Test/Api/WebhookEventTypeTest.php
+++ b/tests/PayPal/Test/Api/WebhookEventTypeTest.php
@@ -2,11 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookEventList;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\WebhookEventType;
 
 /**
diff --git a/tests/PayPal/Test/Api/WebhookListTest.php b/tests/PayPal/Test/Api/WebhookListTest.php
index 4eb2cef..7bb30f6 100644
--- a/tests/PayPal/Test/Api/WebhookListTest.php
+++ b/tests/PayPal/Test/Api/WebhookListTest.php
@@ -2,7 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalModel;
 use PayPal\Api\WebhookList;
 
 /**
diff --git a/tests/PayPal/Test/Api/WebhookTest.php b/tests/PayPal/Test/Api/WebhookTest.php
index 99382db..4198261 100644
--- a/tests/PayPal/Test/Api/WebhookTest.php
+++ b/tests/PayPal/Test/Api/WebhookTest.php
@@ -2,11 +2,6 @@
 
 namespace PayPal\Test\Api;
 
-use PayPal\Common\PayPalResourceModel;
-use PayPal\Validation\ArgumentValidator;
-use PayPal\Api\WebhookList;
-use PayPal\Rest\ApiContext;
-use PayPal\Transport\PayPalRestCall;
 use PayPal\Api\Webhook;
 
 /**
diff --git a/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php b/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php
index 7874711..9f367c1 100644
--- a/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php
+++ b/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php
@@ -4,11 +4,10 @@ namespace PayPal\Test\Auth;
 
 use PayPal\Auth\OAuthTokenCredential;
 use PayPal\Cache\AuthorizationCache;
-use PayPal\Exception\PayPalConnectionException;
+use PayPal\Core\PayPalConfigManager;
 use PayPal\Rest\ApiContext;
 use PayPal\Test\Cache\AuthorizationCacheTest;
 use PayPal\Test\Constants;
-use PayPal\Core\PayPalConfigManager;
 
 class OAuthTokenCredentialTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PayPal/Test/Common/ChildClass.php b/tests/PayPal/Test/Common/ChildClass.php
index 0443857..55dc955 100644
--- a/tests/PayPal/Test/Common/ChildClass.php
+++ b/tests/PayPal/Test/Common/ChildClass.php
@@ -1,8 +1,6 @@
 <?php
 namespace PayPal\Test\Common;
 
-use PayPal\Common\PayPalModel;
-
 class ChildClass extends SimpleClass
 {
 
diff --git a/tests/PayPal/Test/Common/FormatConverterTest.php b/tests/PayPal/Test/Common/FormatConverterTest.php
index d5e2c51..cf81796 100644
--- a/tests/PayPal/Test/Common/FormatConverterTest.php
+++ b/tests/PayPal/Test/Common/FormatConverterTest.php
@@ -7,8 +7,8 @@ use PayPal\Api\Details;
 use PayPal\Api\InvoiceItem;
 use PayPal\Api\Item;
 use PayPal\Api\Tax;
-use PayPal\Converter\FormatConverter;
 use PayPal\Common\PayPalModel;
+use PayPal\Converter\FormatConverter;
 use PayPal\Test\Validation\NumericValidatorTest;
 
 class FormatConverterTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PayPal/Test/Functional/Api/BillingPlansFunctionalTest.php b/tests/PayPal/Test/Functional/Api/BillingPlansFunctionalTest.php
index fb733a9..5c34167 100644
--- a/tests/PayPal/Test/Functional/Api/BillingPlansFunctionalTest.php
+++ b/tests/PayPal/Test/Functional/Api/BillingPlansFunctionalTest.php
@@ -5,15 +5,7 @@ namespace PayPal\Test\Functional\Api;
 use PayPal\Api\Patch;
 use PayPal\Api\PatchRequest;
 use PayPal\Api\Plan;
-use PayPal\Auth\OAuthTokenCredential;
-use PayPal\Common\PayPalModel;
-use PayPal\Core\PayPalCredentialManager;
-use PayPal\Rest\ApiContext;
-use PayPal\Rest\IResource;
-use PayPal\Api\CreateProfileResponse;
 use PayPal\Test\Functional\Setup;
-use PayPal\Transport\PayPalRestCall;
-use PayPal\Api\WebProfile;
 
 /**
  * Class Billing Plans
diff --git a/tests/PayPal/Test/Functional/Api/PaymentsFunctionalTest.php b/tests/PayPal/Test/Functional/Api/PaymentsFunctionalTest.php
index b280efc..bee7fb6 100644
--- a/tests/PayPal/Test/Functional/Api/PaymentsFunctionalTest.php
+++ b/tests/PayPal/Test/Functional/Api/PaymentsFunctionalTest.php
@@ -2,20 +2,10 @@
 
 namespace PayPal\Test\Functional\Api;
 
-use PayPal\Api\Amount;
-use PayPal\Api\Patch;
-use PayPal\Api\PatchRequest;
 use PayPal\Api\Payment;
-use PayPal\Api\PaymentExecution;
 use PayPal\Api\Refund;
 use PayPal\Api\Sale;
-use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
-use PayPal\Rest\IResource;
-use PayPal\Api\CreateProfileResponse;
 use PayPal\Test\Functional\Setup;
-use PayPal\Transport\PayPalRestCall;
-use PayPal\Api\WebProfile;
 
 /**
  * Class WebProfile
diff --git a/tests/PayPal/Test/Functional/Api/PayoutsFunctionalTest.php b/tests/PayPal/Test/Functional/Api/PayoutsFunctionalTest.php
index 5b92897..1c0d640 100644
--- a/tests/PayPal/Test/Functional/Api/PayoutsFunctionalTest.php
+++ b/tests/PayPal/Test/Functional/Api/PayoutsFunctionalTest.php
@@ -2,17 +2,10 @@
 
 namespace PayPal\Test\Functional\Api;
 
-use PayPal\Api\Patch;
 use PayPal\Api\Payout;
 use PayPal\Api\PayoutBatch;
 use PayPal\Api\PayoutItem;
-use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
-use PayPal\Rest\IResource;
-use PayPal\Api\CreateProfileResponse;
 use PayPal\Test\Functional\Setup;
-use PayPal\Transport\PayPalRestCall;
-use PayPal\Api\WebProfile;
 
 /**
  * Class Payouts
diff --git a/tests/PayPal/Test/Functional/Api/WebProfileFunctionalTest.php b/tests/PayPal/Test/Functional/Api/WebProfileFunctionalTest.php
index 90a2409..a99cb6f 100644
--- a/tests/PayPal/Test/Functional/Api/WebProfileFunctionalTest.php
+++ b/tests/PayPal/Test/Functional/Api/WebProfileFunctionalTest.php
@@ -2,14 +2,10 @@
 
 namespace PayPal\Test\Functional\Api;
 
-use PayPal\Api\Patch;
-use PayPal\Common\PayPalModel;
-use PayPal\Rest\ApiContext;
-use PayPal\Rest\IResource;
 use PayPal\Api\CreateProfileResponse;
-use PayPal\Test\Functional\Setup;
-use PayPal\Transport\PayPalRestCall;
+use PayPal\Api\Patch;
 use PayPal\Api\WebProfile;
+use PayPal\Test\Functional\Setup;
 
 /**
  * Class WebProfile
diff --git a/tests/PayPal/Test/Functional/Api/WebhookFunctionalTest.php b/tests/PayPal/Test/Functional/Api/WebhookFunctionalTest.php
index 3f122fe..f7b756b 100644
--- a/tests/PayPal/Test/Functional/Api/WebhookFunctionalTest.php
+++ b/tests/PayPal/Test/Functional/Api/WebhookFunctionalTest.php
@@ -2,27 +2,15 @@
 
 namespace PayPal\Test\Functional\Api;
 
-use PayPal\Api\Amount;
 use PayPal\Api\Patch;
 use PayPal\Api\PatchRequest;
-use PayPal\Api\Payment;
-use PayPal\Api\PaymentExecution;
-use PayPal\Api\Refund;
-use PayPal\Api\Sale;
 use PayPal\Api\Webhook;
 use PayPal\Api\WebhookEvent;
-use PayPal\Api\WebhookEventList;
 use PayPal\Api\WebhookEventType;
 use PayPal\Api\WebhookEventTypeList;
 use PayPal\Api\WebhookList;
-use PayPal\Common\PayPalModel;
 use PayPal\Exception\PayPalConnectionException;
-use PayPal\Rest\ApiContext;
-use PayPal\Rest\IResource;
-use PayPal\Api\CreateProfileResponse;
 use PayPal\Test\Functional\Setup;
-use PayPal\Transport\PayPalRestCall;
-use PayPal\Api\WebProfile;
 
 /**
  * Class WebhookFunctionalTest
diff --git a/tests/PayPal/Test/Functional/Setup.php b/tests/PayPal/Test/Functional/Setup.php
index 1b67a6b..529ffd0 100644
--- a/tests/PayPal/Test/Functional/Setup.php
+++ b/tests/PayPal/Test/Functional/Setup.php
@@ -3,7 +3,6 @@
 namespace PayPal\Test\Functional;
 
 use PayPal\Auth\OAuthTokenCredential;
-use PayPal\Core\PayPalConfigManager;
 use PayPal\Core\PayPalCredentialManager;
 use PayPal\Rest\ApiContext;
 
diff --git a/tests/PayPal/Test/Handler/OauthHandlerTest.php b/tests/PayPal/Test/Handler/OauthHandlerTest.php
index 546629e..b36d625 100644
--- a/tests/PayPal/Test/Handler/OauthHandlerTest.php
+++ b/tests/PayPal/Test/Handler/OauthHandlerTest.php
@@ -2,11 +2,10 @@
 
 namespace PayPal\Test\Handler;
 
-use PayPal\Core\PayPalHttpConfig;
-use PayPal\Exception\PayPalConfigurationException;
-use PayPal\Rest\ApiContext;
 use PayPal\Auth\OAuthTokenCredential;
+use PayPal\Core\PayPalHttpConfig;
 use PayPal\Handler\OauthHandler;
+use PayPal\Rest\ApiContext;
 
 class OauthHandlerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PayPal/Test/Validation/NumericValidatorTest.php b/tests/PayPal/Test/Validation/NumericValidatorTest.php
index 46342cc..360ea04 100644
--- a/tests/PayPal/Test/Validation/NumericValidatorTest.php
+++ b/tests/PayPal/Test/Validation/NumericValidatorTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace PayPal\Test\Validation;
 
-use PayPal\Converter\FormatConverter;
 use PayPal\Validation\NumericValidator;
 
 class NumericValidatorTest extends \PHPUnit_Framework_TestCase