diff --git a/extras/kolab_policy_greylist.py b/extras/kolab_policy_greylist.py
index 0b627a40..6a99abdf 100755
--- a/extras/kolab_policy_greylist.py
+++ b/extras/kolab_policy_greylist.py
@@ -1,89 +1,79 @@
 #!/usr/bin/python3
 """
 An example implementation of a policy service.
 """
 
 import json
 import time
 import sys
 
 import requests
 
 
 def read_request_input():
     """
         Read a single policy request from sys.stdin, and return a dictionary
         containing the request.
     """
     start_time = time.time()
 
     policy_request = {}
     end_of_request = False
 
     while not end_of_request:
         if (time.time() - start_time) >= 10:
             sys.exit(0)
 
         request_line = sys.stdin.readline()
 
         if request_line.strip() == '':
             if 'request' in policy_request:
                 end_of_request = True
         else:
             request_line = request_line.strip()
             request_key = request_line.split('=')[0]
             request_value = '='.join(request_line.split('=')[1:])
 
             policy_request[request_key] = request_value
 
     return policy_request
 
 
 if __name__ == "__main__":
-    TOKEN = 'abcdef'
-    # URL = 'https://services.kolabnow.com/api/webhooks/greylist'
-    # URL = 'http://127.0.0.1:8000/api/webhooks/greylist'
-    URL = 'https://kanarip.dev.kolab.io/api/webhooks/greylist'
+    URL = 'https://services.kolabnow.com/api/webhooks/greylist'
 
     # Start the work
     while True:
         REQUEST = read_request_input()
 
-        # print("timestamp={0}".format(REQUEST['timestamp']))
-
         try:
             RESPONSE = requests.post(
                 URL,
                 data=REQUEST,
-                headers={'X-Token': TOKEN},
                 verify=True
             )
         # pylint: disable=broad-except
         except Exception:
             print("action=DEFER_IF_PERMIT Temporary error, try again later.")
             sys.exit(1)
 
         try:
             R = json.loads(RESPONSE.text)
         # pylint: disable=broad-except
         except Exception:
             sys.exit(1)
 
         if 'prepend' in R:
             for prepend in R['prepend']:
                 print("action=PREPEND {0}".format(prepend))
 
         if RESPONSE.ok:
-            print(
-                "action={0}\n".format(R['response'])
-            )
+            print("action={0}\n".format(R['response']))
 
             sys.stdout.flush()
         else:
-            print(
-                "action={0} {1}\n".format(R['response'], R['reason'])
-            )
+            print("action={0} {1}\n".format(R['response'], R['reason']))
 
             sys.stdout.flush()
 
         sys.exit(0)
diff --git a/extras/kolab_policy_spf.py b/extras/kolab_policy_spf.py
index 4d6796a3..26cbae3f 100755
--- a/extras/kolab_policy_spf.py
+++ b/extras/kolab_policy_spf.py
@@ -1,90 +1,80 @@
 #!/usr/bin/python3
 """
 This is the implementation of a (postfix) MTA policy service to enforce the
 Sender Policy Framework.
 """
 
 import json
 import time
 import sys
 
 import requests
 
 
 def read_request_input():
     """
         Read a single policy request from sys.stdin, and return a dictionary
         containing the request.
     """
     start_time = time.time()
 
     policy_request = {}
     end_of_request = False
 
     while not end_of_request:
         if (time.time() - start_time) >= 10:
             sys.exit(0)
 
         request_line = sys.stdin.readline()
 
         if request_line.strip() == '':
             if 'request' in policy_request:
                 end_of_request = True
         else:
             request_line = request_line.strip()
             request_key = request_line.split('=')[0]
             request_value = '='.join(request_line.split('=')[1:])
 
             policy_request[request_key] = request_value
 
     return policy_request
 
 
 if __name__ == "__main__":
-    TOKEN = 'abcdef'
-    # URL = 'https://services.kolabnow.com/api/webhooks/spf'
-    # URL = 'http://127.0.0.1:8000/api/webhooks/spf'
-    URL = 'https://kanarip.dev.kolab.io/api/webhooks/spf'
+    URL = 'https://services.kolabnow.com/api/webhooks/spf'
 
     # Start the work
     while True:
         REQUEST = read_request_input()
 
-        # print("timestamp={0}".format(REQUEST['timestamp']))
-
         try:
             RESPONSE = requests.post(
                 URL,
                 data=REQUEST,
-                headers={'X-Token': TOKEN},
                 verify=True
             )
         # pylint: disable=broad-except
         except Exception:
             print("action=DEFER_IF_PERMIT Temporary error, try again later.")
             sys.exit(1)
 
         try:
             R = json.loads(RESPONSE.text)
         # pylint: disable=broad-except
         except Exception:
             sys.exit(1)
 
         if 'prepend' in R:
             for prepend in R['prepend']:
                 print("action=PREPEND {0}".format(prepend))
 
         if RESPONSE.ok:
-            print(
-                "action={0}\n".format(R['response'])
-            )
+            print("action={0}\n".format(R['response']))
 
             sys.stdout.flush()
         else:
-            print(
-                "action={0} {1}\n".format(R['response'], R['reason'])
-            )
+            print("action={0} {1}\n".format(R['response'], R['reason']))
 
             sys.stdout.flush()
 
         sys.exit(0)