diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index be015b015c..e380f0dbf8 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -160,6 +160,17 @@ class BaseDriver extends AbstractPaymentDriver
     {
     }
 
+    /**
+     * Detaches a payment method from the gateway
+     * 
+     * @param  ClientGatewayToken $token The gateway token
+     * @return bool                      boolean response
+     */
+    public function detach(ClientGatewayToken $token)
+    {
+        return true;
+    }
+
     /**
      * Set the inbound request payment method type for access.
      *
diff --git a/app/PaymentDrivers/WePay/ACH.php b/app/PaymentDrivers/WePay/ACH.php
index a6580b22c8..b2d8cbf582 100644
--- a/app/PaymentDrivers/WePay/ACH.php
+++ b/app/PaymentDrivers/WePay/ACH.php
@@ -198,7 +198,7 @@ class ACH
             return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
 
         $response = $this->wepay_payment_driver->wepay->request('checkout/create', array(
-            'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
+            // 'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
             'unique_id'           => Str::random(40),
             'account_id'          => $this->wepay_payment_driver->company_gateway->getConfigField('accountId'),
             'amount'              => $this->wepay_payment_driver->payment_hash->data->amount_with_fee,
diff --git a/app/PaymentDrivers/WePay/CreditCard.php b/app/PaymentDrivers/WePay/CreditCard.php
index 3bdd17876d..950b143e85 100644
--- a/app/PaymentDrivers/WePay/CreditCard.php
+++ b/app/PaymentDrivers/WePay/CreditCard.php
@@ -117,7 +117,7 @@ use WePayCommon;
             nlog("authorize the card first!");
 
             $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
-                'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
+                // 'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
                 'client_id'          => config('ninja.wepay.client_id'),
                 'client_secret'      => config('ninja.wepay.client_secret'),
                 'credit_card_id'     => (int)$request->input('credit_card_id'),
@@ -142,7 +142,7 @@ use WePayCommon;
         nlog($request->all());
         // charge the credit card
         $response = $this->wepay_payment_driver->wepay->request('checkout/create', array(
-            'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
+            // 'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
             'unique_id'           => Str::random(40),
             'account_id'          => $this->wepay_payment_driver->company_gateway->getConfigField('accountId'),
             'amount'              => $this->wepay_payment_driver->payment_hash->data->amount_with_fee,
diff --git a/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php b/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php
index b3b2e8a028..2c122944aa 100644
--- a/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php
+++ b/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php
@@ -72,7 +72,7 @@
                     </div>
 
                     @if($country == 'CA')
-                        <div class="col-span-6 sm:col-span-4">
+                        <div class="col-span-6 sm:col-span-4 {{ $country != 'CA' ? 'hidden' : 'block' }}">
                             <label for="country" class="input-label">@lang('texts.debit_cards')</label>
 
                             <div class="checkbox">
@@ -82,15 +82,16 @@
                         </div>
                     @endif
 
-                    <!--
-                    <div class="col-span-6 sm:col-span-4">
+                    
+                    @if($country == 'US')
+                    <div class="col-span-6 sm:col-span-4 {{ $country != 'US' ? 'hidden' : 'block' }}">
                         <label for="country" class="input-label">@lang('texts.ach')</label>
                         <div class="checkbox">
                             <input class="form-checkbox cursor-pointer mr-2" type="checkbox" name="ach" value="1" wire:model="ach">
                             <span>{{ ctrans('texts.enable_ach')}}</span>
                         </div>
                     </div>
-                    -->
+                    @endif
 
                     <div class="col-span-6 sm:col-span-4">
                         <label for="country" class="input-label"></label>
@@ -281,5 +282,4 @@
             </div>
         </div>
     </form>
-
 </div>