diff --git a/config/common.yml b/config/common.yml
index ac6af0ea4..954484bbf 100644
--- a/config/common.yml
+++ b/config/common.yml
@@ -12,12 +12,13 @@ services:
     arguments:
       - 'PrestaShop\Module\PsAccounts\Service\PsAccountsService'
 
-  PrestaShop\Module\PsAccounts\Service\PsBillingService:
-    class: PrestaShop\Module\PsAccounts\Service\PsBillingService
-    public: true
-    factory: [ 'PrestaShop\Module\PsAccounts\ServiceContainer\StaticProvider', 'provide' ]
-    arguments:
-      - 'PrestaShop\Module\PsAccounts\Service\PsBillingService'
+# FIXME: probably totally useless now
+#  PrestaShop\Module\PsAccounts\Service\PsBillingService:
+#    class: PrestaShop\Module\PsAccounts\Service\PsBillingService
+#    public: true
+#    factory: [ 'PrestaShop\Module\PsAccounts\ServiceContainer\StaticProvider', 'provide' ]
+#    arguments:
+#      - 'PrestaShop\Module\PsAccounts\Service\PsBillingService'
 
   PrestaShop\Module\PsAccounts\Repository\UserTokenRepository:
     class: PrestaShop\Module\PsAccounts\Repository\UserTokenRepository
diff --git a/ps_accounts.php b/ps_accounts.php
index 72d93d20b..be8e6c2da 100644
--- a/ps_accounts.php
+++ b/ps_accounts.php
@@ -261,6 +261,16 @@ public function getService($serviceName)
         }
     }
 
+    /**
+     * @param string $serviceName
+     *
+     * @return bool
+     */
+    public function hasService($serviceName)
+    {
+        return $this->getServiceContainer()->has($serviceName);
+    }
+
     /**
      * @param string $name
      *