diff --git a/acme/schemata/authorization.json b/acme/schemata/authorization.json
deleted file mode 100644
index 122f263e1..000000000
--- a/acme/schemata/authorization.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/authorization#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for an authorization message",
-    "type": "object",
-    "required": ["type"],
-    "properties": {
-        "type" : {
-            "enum" : [ "authorization" ]
-        },
-        "recoveryToken" : {
-            "type": "string"
-        },
-        "identifier" : {
-            "type": "string"
-        },
-        "jwk": {
-            "$ref": "file:acme/schemata/jwk.json"
-        }
-    }
-}
diff --git a/acme/schemata/authorizationRequest.json b/acme/schemata/authorizationRequest.json
deleted file mode 100644
index 2d4371cb8..000000000
--- a/acme/schemata/authorizationRequest.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/authorizationRequest#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for an authorizationRequest message",
-    "type": "object",
-    "required": ["type", "sessionID", "nonce", "signature", "responses"],
-    "properties": {
-        "type" : {
-            "enum" : [ "authorizationRequest" ]
-        },
-        "sessionID" : {
-            "type" : "string" 
-        },
-        "nonce" : {
-            "type": "string"
-        },
-        "signature" : {
-            "$ref": "file:acme/schemata/signature.json"
-        },
-        "responses": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "anyOf": [
-                     { "$ref": "file:acme/schemata/responseobject.json" },
-                     { "type": "null" }
-                ]
-            }
-        },
-        "contact": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "type": "string"
-                }
-        }
-    }
-}
diff --git a/acme/schemata/certificate.json b/acme/schemata/certificate.json
deleted file mode 100644
index 1d4e98947..000000000
--- a/acme/schemata/certificate.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/certificate#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a certificate message",
-    "type": "object",
-    "required": ["type", "certificate"],
-    "properties": {
-        "type" : {
-            "enum" : [ "certificate" ]
-        },
-        "certificate" : {
-            "type" : "string" 
-        },
-        "chain" : {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "type": "string"
-            }
-        },
-        "refresh" : {
-            "type": "string"
-        }
-    }
-}
diff --git a/acme/schemata/certificateRequest.json b/acme/schemata/certificateRequest.json
deleted file mode 100644
index ef3e18f98..000000000
--- a/acme/schemata/certificateRequest.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/certificateRequest#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a certificateRequest message",
-    "type": "object",
-    "required": ["type", "csr", "signature"],
-    "properties": {
-        "type" : {
-            "enum" : [ "certificateRequest" ]
-        },
-        "csr" : {
-            "type" : "string" ,
-            "pattern": "^[-_=0-9A-Za-z]+$"
-        },
-        "signature" : {
-            "$ref": "file:acme/schemata/signature.json"
-        }
-    }
-}
diff --git a/acme/schemata/challenge.json b/acme/schemata/challenge.json
deleted file mode 100644
index 978fcd4c4..000000000
--- a/acme/schemata/challenge.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/challenge#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a challenge message",
-    "type": "object",
-    "required": ["type", "sessionID", "nonce", "challenges"],
-    "properties": {
-        "type" : {
-            "enum" : [ "challenge" ]
-        },
-        "sessionID" : {
-            "type" : "string" 
-        },
-        "nonce" : {
-            "type": "string"
-        },
-        "challenges": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "$ref": "file:acme/schemata/challengeobject.json"
-            }
-        },
-        "combinations": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "type": "array",
-                "minItems": 1,
-                "items": {
-                    "type": "integer" 
-                }
-            }
-        }
-    }
-}
diff --git a/acme/schemata/challengeRequest.json b/acme/schemata/challengeRequest.json
deleted file mode 100644
index 0762fa9c8..000000000
--- a/acme/schemata/challengeRequest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/challengeRequest#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a challengeRequest message",
-    "type": "object",
-    "required": ["type", "identifier"],
-    "properties": {
-        "type" : {
-            "enum" : [ "challengeRequest" ]
-        },
-        "identifier" : {
-            "type": "string"
-        }
-    }
-}
diff --git a/acme/schemata/challengeobject.json b/acme/schemata/challengeobject.json
deleted file mode 100644
index 7709f315d..000000000
--- a/acme/schemata/challengeobject.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/challengeobject#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Subschema for an individual challenge (within challenge)",
-    "anyOf": [
-               { "type": "object",
-                 "required": ["type", "token"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "simpleHttp" ]
-                     },
-                     "token": {
-                         "type": "string"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type", "r", "nonce"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "dvsni" ]
-                     },
-                     "r": {
-                         "type" : [ "string" ],
-                         "pattern": "^[-_=0-9A-Za-z]+$"
-                     },
-                     "nonce": {
-                         "type": "string",
-                         "pattern": "^[0-9a-f]+$"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "recoveryContact" ]
-                     },
-                     "activationURL": {
-                         "type" : "string"
-                     },
-                     "successURL": {
-                         "type": "string"
-                     },
-                     "contact": {
-                         "type": "string"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "recoveryToken" ]
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type", "alg", "nonce", "hints"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "proofOfPossession" ]
-                     },
-                     "alg": {
-                         "type": "string"
-                     },
-                     "nonce": {
-                         "type": "string",
-                         "pattern": "^[-_=0-9A-Za-z]+$"
-                     },
-                     "hints": {
-                         "type": "object",
-                         "properties": {
-                             "jwk": {
-                                  "type": "object"
-                             },
-                             "certFingerprints": {
-                                  "type": "array",
-                                  "minItems": 1,
-                                  "items": {
-                                      "type": "string",
-                                      "pattern": "^[0-9a-f]+$"
-                                  }
-                             },
-                             "subjectKeyIdentifiers": {
-                                  "type": "array",
-                                  "minItems": 1,
-                                  "items": {
-                                      "type": "string",
-                                      "pattern": "^[0-9a-f]+$"
-                                  }
-                             },
-                             "serialNumbers": {
-                                  "type": "array",
-                                  "minItems": 1,
-                                  "items": {
-                                      "type": "integer"
-                                  }
-                             },
-                             "issuers": {
-                                  "type": "array",
-                                  "minItems": 1,
-                                  "items": {
-                                      "type": "string"
-                                  }
-                             },
-                             "authorizedFor": {
-                                  "type": "array",
-                                  "minItems": 1,
-                                  "items": {
-                                      "type": "string"
-                                  }
-                             }
-                         }
-                     }
-                 }
-               },
-               { "type": "object",
-                 "required": ["type", "token"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "dns" ]
-                     },
-                     "token": {
-                         "type": "string"
-                     }
-                 }
-               }
-             ]
-}
diff --git a/acme/schemata/defer.json b/acme/schemata/defer.json
deleted file mode 100644
index 21edd614b..000000000
--- a/acme/schemata/defer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/defer#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a defer message",
-    "type": "object",
-    "required": ["type", "token"],
-    "properties": {
-        "type" : {
-            "enum" : [ "defer" ]
-        },
-        "token" : {
-            "type": "string"
-        },
-        "interval" : {
-            "type": "integer"
-        },
-        "message": {
-            "type": "string"
-        }
-    }
-}
diff --git a/acme/schemata/error.json b/acme/schemata/error.json
deleted file mode 100644
index 359506b52..000000000
--- a/acme/schemata/error.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/error#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for an error message",
-    "type": "object",
-    "required": ["type", "error"],
-    "properties": {
-        "type" : {
-            "enum" : [ "error" ]
-        },
-        "error" : {
-            "enum" : [ "malformed", "unauthorized", "serverInternal", "nonSupported", "unknown", "badCSR" ]
-        },
-        "message" : {
-            "type": "string"
-        },
-        "moreInfo": {
-            "type": "string"
-        }
-    }
-}
diff --git a/acme/schemata/jwk.json b/acme/schemata/jwk.json
deleted file mode 100644
index b9cca8840..000000000
--- a/acme/schemata/jwk.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/jwk#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a jwk (**kty RSA/e=65537 ONLY**)",
-    "type": "object",
-    "required": ["kty", "e", "n"],
-    "properties": {
-        "kty": {
-            "enum" : [ "RSA" ]
-        },
-        "e": {
-            "enum" : [ "AQAB" ]
-        },
-        "n": {
-            "type": "string",
-            "pattern": "^[-_=0-9A-Za-z]+$"
-        }
-    }
-}
diff --git a/acme/schemata/responseobject.json b/acme/schemata/responseobject.json
deleted file mode 100644
index 5773f3a73..000000000
--- a/acme/schemata/responseobject.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/responseobject#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Subschema for an individual challenge response (within authorizationRequest)",
-    "anyOf": [
-               { "type": "object",
-                 "required": ["type", "path"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "simpleHttp" ]
-                     },
-                     "path": {
-                         "type": "string"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type", "s"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "dvsni" ]
-                     },
-                     "s": {
-                         "type" : [ "string" ],
-                         "pattern": "^[-_=0-9A-Za-z]+$"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "recoveryContact" ]
-                     },
-                     "token": {
-                         "type" : "string"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "recoveryToken" ]
-                     },
-                     "token": {
-                         "type" : "string"
-                     }
-                  }
-               },
-               { "type": "object",
-                 "required": ["type", "nonce", "signature"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "proofOfPossession" ]
-                     },
-                     "nonce": {
-                         "type": "string",
-                         "pattern": "^[-_=0-9A-Za-z]+$"
-                     },
-                     "signature": {
-                         "$ref": "file:acme/schemata/signature.json"
-                         }
-                     }
-               },
-               { "type": "object",
-                 "required": ["type"],
-                 "properties": {
-                     "type": {
-                         "enum" : [ "dns" ]
-                     }
-                 }
-               }
-             ]
-}
diff --git a/acme/schemata/revocation.json b/acme/schemata/revocation.json
deleted file mode 100644
index 53455d506..000000000
--- a/acme/schemata/revocation.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/revocation#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a revocation message",
-    "type": "object",
-    "required": ["type"],
-    "properties": {
-        "type" : {
-            "enum" : [ "revocation" ]
-        }
-    }
-}
diff --git a/acme/schemata/revocationRequest.json b/acme/schemata/revocationRequest.json
deleted file mode 100644
index 7559d0ee0..000000000
--- a/acme/schemata/revocationRequest.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/revocationRequest#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a revocationRequest message",
-    "type": "object",
-    "required": ["type", "certificate", "signature"],
-    "properties": {
-        "type" : {
-            "enum" : [ "revocationRequest" ]
-        },
-        "certificate" : {
-            "type" : "string" 
-        },
-        "signature" : {
-            "$ref": "file:acme/schemata/signature.json"
-        }
-    }
-}
diff --git a/acme/schemata/signature.json b/acme/schemata/signature.json
deleted file mode 100644
index e70652e7c..000000000
--- a/acme/schemata/signature.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/signature#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a signature (alg RS256/e=65537 or P-256 ONLY)",
-    "type": "object",
-    "required": ["alg", "nonce", "sig", "jwk"],
-    "properties": {
-        "anyOf": [
-                 {
-                     "alg" : {
-                         "enum" : [ "RS256" ]
-                     },
-                     "nonce" : {
-                         "type" : "string" 
-                     },
-                     "sig" : {
-                         "type": "string",
-                         "pattern": "^[-_=0-9A-Za-z]+$"
-                     },
-                     "jwk": {
-                         "type": "object",
-                             "required": ["kty", "e", "n"],
-                             "properties": {
-                                 "kty": {
-                                     "enum" : [ "RSA" ]
-                                 },
-                                 "e": {
-                                     "enum" : [ "AQAB" ]
-                                 },
-                                 "n": {
-                                     "type": "string",
-                                     "pattern": "^[-_=0-9A-Za-z]+$"
-                                 }
-                             }
-                      }
-                 },
-                 {
-                     "alg" : {
-                         "enum" : [ "ES256" ]
-                     },
-                     "nonce" : {
-                         "type" : "string" 
-                     },
-                     "sig" : {
-                         "type": "string",
-                         "pattern": "^[-_=0-9A-Za-z]+$"
-                     },
-                     "jwk": {
-                         "type": "object",
-                             "required": ["kty", "crv", "x", "y"],
-                             "properties": {
-                                 "kty": {
-                                     "enum" : [ "EC" ]
-                                 },
-                                 "crv": {
-                                     "enum" : [ "P-256" ]
-                                 },
-                                 "x": {
-                                     "type": "string",
-                                     "pattern": "^[-_=0-9A-Za-z]+$"
-                                 },
-                                 "y": {
-                                     "type": "string",
-                                     "pattern": "^[-_=0-9A-Za-z]+$"
-                                 }
-                             }
-                      }
-                 }
-                 ]
-        }
-}
diff --git a/acme/schemata/statusRequest.json b/acme/schemata/statusRequest.json
deleted file mode 100644
index 8e4221cbe..000000000
--- a/acme/schemata/statusRequest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "https://letsencrypt.org/schema/01/statusRequest#",
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "Schema for a statusRequest message",
-    "type": "object",
-    "required": ["type", "token"],
-    "properties": {
-        "type" : {
-            "enum" : [ "statusRequest" ]
-        },
-        "token" : {
-            "type": "string"
-        }
-    }
-}