diff --git a/src/main/java/io/kamax/mxisd/HttpMxisd.java b/src/main/java/io/kamax/mxisd/HttpMxisd.java
index 35ab09e..c3aff61 100644
--- a/src/main/java/io/kamax/mxisd/HttpMxisd.java
+++ b/src/main/java/io/kamax/mxisd/HttpMxisd.java
@@ -198,8 +198,7 @@ public class HttpMxisd {
 
     private void termsEndpoints(RoutingHandler routingHandler) {
         routingHandler.get(GetTermsHandler.PATH, new GetTermsHandler(m.getConfig().getPolicy()));
-        wrapWithTokenAndAuthorizationHandlers(routingHandler, Methods.POST, sane(new AcceptTermsHandler(m.getAccMgr())),
-            AcceptTermsHandler.PATH, true);
+        routingHandler.post(AcceptTermsHandler.PATH, sane(new AcceptTermsHandler(m.getAccMgr())));
     }
 
     private void hashEndpoints(RoutingHandler routingHandler) {
diff --git a/src/main/java/io/kamax/mxisd/hash/storage/SqlHashStorage.java b/src/main/java/io/kamax/mxisd/hash/storage/SqlHashStorage.java
index 43123d1..90852e1 100644
--- a/src/main/java/io/kamax/mxisd/hash/storage/SqlHashStorage.java
+++ b/src/main/java/io/kamax/mxisd/hash/storage/SqlHashStorage.java
@@ -12,6 +12,7 @@ public class SqlHashStorage implements HashStorage {
 
     public SqlHashStorage(IStorage storage) {
         this.storage = storage;
+        Runtime.getRuntime().addShutdownHook(new Thread(storage::clearHashes));
     }
 
     @Override