diff --git a/sql/setup-database.sql b/sql/setup-database.sql
index df4ef7b9faa3826a62b7a8e558b4f6b701163364..b61c2bcfd2b04ad24f471399b313d2113f103130 100644
--- a/sql/setup-database.sql
+++ b/sql/setup-database.sql
@@ -1,39 +1,3 @@
-CREATE TABLE `oauth2_client` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(255) NOT NULL,
-  `icon` varchar(255) DEFAULT NULL,
-  `client` varchar(255) NOT NULL,
-  `secret` varchar(255) NOT NULL,
-  `redirect_url` text NOT NULL,
-  `scope` varchar(255) DEFAULT NULL,
-  `home_page` varchar(255) DEFAULT NULL,
-  `show_in_home` tinyint(1) DEFAULT 0,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `oauth2_client_auth_methods` (
-  `client_id` int NOT NULL,
-  `auth_method` varchar(50) NOT NULL,
-  PRIMARY KEY (`client_id`, `auth_method`),
-  FOREIGN KEY (`client_id`) REFERENCES `oauth2_client`(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `oauth2_client_scope_audience_mapping` (
-  `client_id` int NOT NULL,
-  `scope` varchar(255) NOT NULL,
-  `audience` text NOT NULL,
-  PRIMARY KEY (`client_id`, `scope`),
-  FOREIGN KEY (`client_id`) REFERENCES `oauth2_client`(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `cli_client` (
-  `client_id` varchar(255) NOT NULL,
-  `client_secret` varchar(255) NOT NULL,
-  `scope` text,
-  `audience` text,
-  PRIMARY KEY (`client_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 CREATE TABLE `user` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `primary_identity` bigint(20) DEFAULT NULL,
@@ -103,23 +67,8 @@ CREATE TABLE `rsa_keypairs` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `public_jwk` (
-  `kid` varchar(255) NOT NULL,
-  `key` text,
-  `url` text,
-  `update_time` BIGINT NOT NULL,
-  PRIMARY KEY (`kid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 CREATE TABLE `rap_permissions` (
   `user_id` bigint NOT NULL,
   `permission` varchar(255) NOT NULL,
   PRIMARY KEY (`user_id`, `permission`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE EVENT login_tokens_cleanup
-    ON SCHEDULE
-      EVERY 1 MINUTE
-    COMMENT 'Remove expired login tokens'
-    DO
-      DELETE FROM login_token WHERE CURRENT_TIMESTAMP > TIMESTAMPADD(MINUTE,1,creation_time);