diff --git a/mdserver.py b/mdserver.py
index 8fed186a47775498f3bb039e0bd522bc79eab045..b3dec1a9702450da92eef0d682d7a8233d49bb42 100755
--- a/mdserver.py
+++ b/mdserver.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
-from utils import read_config, Resource, server
+from utils import read_config, Resource, Server
 from flask import Flask, Response
 
 config = read_config()
 app = Flask(__name__)
-
+server = Server()
 
 @app.route('/<domain>/entities/<path:entity_id>', methods=['GET'])
 def serve(domain, entity_id):
diff --git a/mdsigner.py b/mdsigner.py
index 3dc533f991a1d0d98be9daba43306bbc7198dfa0..7c3e160e9dca64a96264c88b4a42b3afbc785bf2 100755
--- a/mdsigner.py
+++ b/mdsigner.py
@@ -6,8 +6,8 @@ from concurrent.futures import ThreadPoolExecutor
 from lxml import etree as ET
 # import traceback
 
-from utils import hasher, Signers
-
+from utils import hasher
+from signers import Signers
 
 # Find all IdP's in edugain metadata
 idps = []
diff --git a/signers.py b/signers.py
index 9168c7a4b086db7e12058849f4a7b57661147bc7..e9717f04806dbdf72b4fe9b67581bc3acb73ef03 100644
--- a/signers.py
+++ b/signers.py
@@ -1,22 +1,21 @@
 import xmlsec
-from signxml import XMLSigner
 
-cert = open("meta.crt").read()
-key = open("meta.key").read()
+cert = "meta.crt"
+key = "meta.key"
 
 
 def Signers(signer):
     def _normal_signer(xml):
         print("Normal signer")
-        return XMLSigner().sign(xml, key=key, cert=cert)
+        return xmlsec.sign(xml, key_spec=key, cert_spec=cert)
 
     def _test_signer(xml):
         print("Test signer")
-        return XMLSigner().sign(xml, key=key, cert=cert)
+        return xmlsec.sign(xml, key_spec=key, cert_spec=cert)
 
     def _foobar_signer(xml):
         print("Foobar signer")
-        return XMLSigner().sign(xml, key=key, cert=cert)
+        return xmlsec.sign(xml, key_spec=key, cert_spec=cert)
 
     def _hsm_signer(xml):
         print("HSM signer")
diff --git a/utils.py b/utils.py
index 6fffdcdaeccbaf262a3bd04ac37a64111f07cd6b..0792dc0237e35a37d80bc45950827d223c76ddc3 100755
--- a/utils.py
+++ b/utils.py
@@ -151,6 +151,3 @@ class Server:
 
     def __getitem__(self, domain):
         return self.__dict__[domain]
-
-
-server = Server()