diff --git a/pinecrypt/server/api/ocsp.py b/pinecrypt/server/api/ocsp.py
deleted file mode 100644
index 953a1f1..0000000
--- a/pinecrypt/server/api/ocsp.py
+++ /dev/null
@@ -1,127 +0,0 @@
-import pytz
-from asn1crypto.util import timezone
-from asn1crypto import ocsp
-from pinecrypt.server import const, authority
-from datetime import datetime, timedelta
-from math import inf
-from motor.motor_asyncio import AsyncIOMotorClient
-from oscrypto import asymmetric
-from prometheus_client import Counter, Histogram
-from sanic import Sanic, response
-from sanic_prometheus import monitor
-
-ocsp_request_valid = Counter("pinecrypt_ocsp_request_valid",
-    "Valid OCSP requests")
-ocsp_request_list_size = Histogram("pinecrypt_ocsp_request_list_size",
-    "Histogram of OCSP request list size",
-    buckets=(1, 2, 3, inf))
-ocsp_request_size_bytes = Histogram("pinecrypt_ocsp_request_size_bytes",
-    "Histogram of OCSP request size in bytes",
-    buckets=(100, 200, 500, 1000, 2000, 5000, 10000, inf))
-ocsp_request_nonces = Histogram("pinecrypt_ocsp_request_nonces",
-    "Histogram of nonce count per request",
-    buckets=(1, 2, 3, inf))
-ocsp_response_status = Counter("pinecrypt_ocsp_response_status",
-    "Status responses", ["status"])
-
-app = Sanic("events")
-monitor(app).expose_endpoint()
-
-
-@app.listener("before_server_start")
-async def setup_db(app, loop):
-    # TODO: find cleaner way to do this, for more see
-    # https://github.com/sanic-org/sanic/issues/919
-    app.ctx.db = AsyncIOMotorClient(const.MONGO_URI).get_default_database()
-
-
-@app.route("/api/ocsp/", methods=["POST"])
-async def view_ocsp_responder(request):
-    ocsp_request_size_bytes.observe(len(request.body))
-    ocsp_req = ocsp.OCSPRequest.load(request.body)
-
-    server_certificate = authority.get_ca_cert()
-
-    now = datetime.now(timezone.utc).replace(microsecond=0)
-    response_extensions = []
-
-    nonces = 0
-    for ext in ocsp_req["tbs_request"]["request_extensions"]:
-        if ext["extn_id"].native == "nonce":
-            nonces += 1
-            response_extensions.append(
-                ocsp.ResponseDataExtension({
-                    "extn_id": "nonce",
-                    "critical": False,
-                    "extn_value": ext["extn_value"]
-                })
-            )
-
-    ocsp_request_nonces.observe(nonces)
-    ocsp_request_valid.inc()
-
-    responses = []
-
-    ocsp_request_list_size.observe(len(ocsp_req["tbs_request"]["request_list"]))
-    for item in ocsp_req["tbs_request"]["request_list"]:
-        serial = item["req_cert"]["serial_number"].native
-        assert serial > 0, "Serial number correctness check failed"
-
-        doc = await app.ctx.db.certidude_certificates.find_one({"serial_number": "%x" % serial})
-        if doc:
-            if doc["status"] == "signed":
-                status = ocsp.CertStatus(name="good", value=None)
-                ocsp_response_status.labels("good").inc()
-            elif doc["status"] == "revoked":
-                status = ocsp.CertStatus(
-                    name="revoked",
-                    value={
-                        "revocation_time": doc["revoked"].replace(tzinfo=pytz.UTC),
-                        "revocation_reason": doc["revocation_reason"],
-                    })
-                ocsp_response_status.labels("revoked").inc()
-            else:
-                # This should not happen, if it does database is mangled
-                raise ValueError("Invalid/unknown certificate status '%s'" % doc["status"])
-        else:
-            status = ocsp.CertStatus(name="unknown", value=None)
-            ocsp_response_status.labels("unknown").inc()
-
-        responses.append({
-            "cert_id": {
-                "hash_algorithm": {
-                    "algorithm": "sha1"
-                },
-                "issuer_name_hash": server_certificate.asn1.subject.sha1,
-                "issuer_key_hash": server_certificate.public_key.asn1.sha1,
-                "serial_number": serial,
-            },
-            "cert_status": status,
-            "this_update": now - const.CLOCK_SKEW_TOLERANCE,
-            "next_update": now + timedelta(minutes=15) + const.CLOCK_SKEW_TOLERANCE,
-            "single_extensions": []
-        })
-
-    response_data = ocsp.ResponseData({
-        "responder_id": ocsp.ResponderId(name="by_key", value=server_certificate.public_key.asn1.sha1),
-        "produced_at": now,
-        "responses": responses,
-        "response_extensions": response_extensions
-    })
-
-    return response.raw(ocsp.OCSPResponse({
-        "response_status": "successful",
-        "response_bytes": {
-            "response_type": "basic_ocsp_response",
-            "response": {
-                "tbs_response_data": response_data,
-                "certs": [server_certificate.asn1],
-                "signature_algorithm": {"algorithm": "sha1_ecdsa" if authority.public_key.algorithm == "ec" else "sha1_rsa" },
-                "signature": (asymmetric.ecdsa_sign if authority.public_key.algorithm == "ec" else asymmetric.rsa_pkcs1v15_sign)(
-                    authority.private_key,
-                    response_data.dump(),
-                    "sha1"
-                )
-            }
-        }
-    }).dump(), headers={"Content-Type": "application/ocsp-response"})
diff --git a/pinecrypt/server/cli.py b/pinecrypt/server/cli.py
index 7086931..05e53d3 100644
--- a/pinecrypt/server/cli.py
+++ b/pinecrypt/server/cli.py
@@ -171,13 +171,6 @@ def pinecone_housekeeping_expiration():
     # TODO: Send separate e-mails to subjects
 
 
-@click.command("ocsp-responder")
-@waitfile(const.AUTHORITY_CERTIFICATE_PATH)
-def pinecone_serve_ocsp_responder():
-    from pinecrypt.server.api.ocsp import app
-    app.run(port=5001, debug=const.DEBUG)
-
-
 @click.command("events")
 def pinecone_serve_events():
     from pinecrypt.server.api.events import app
@@ -560,7 +553,6 @@ def entry_point(): pass
 
 
 pinecone_serve.add_command(pinecone_serve_backend)
-pinecone_serve.add_command(pinecone_serve_ocsp_responder)
 pinecone_serve.add_command(pinecone_serve_events)
 pinecone_serve.add_command(pinecone_serve_builder)
 pinecone_session.add_command(pinecone_session_list)