diff --git a/openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql b/openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql
index 4b0a01a2d..5972579cd 100644
--- a/openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql
+++ b/openid-connect-server/src/main/resources/db/tables/hsql_database_tables.sql
@@ -125,25 +125,11 @@ CREATE TABLE IF NOT EXISTS client_default_acr_value (
 	default_acr_value VARCHAR(2000)
 );
 
-CREATE TABLE IF NOT EXISTS client_nonce (
-	id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
-	value VARCHAR(256),
-	client_id VARCHAR(256),
-	use_date TIMESTAMP,
-	expire_date TIMESTAMP
-);
-
 CREATE TABLE IF NOT EXISTS client_contact (
 	owner_id BIGINT,
 	contact VARCHAR(256)
 );
 
-CREATE TABLE IF NOT EXISTS event (
-	id BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,
-	type INT,
-	timestamp DATE
-);
-
 CREATE TABLE IF NOT EXISTS client_redirect_uri (
 	owner_id BIGINT, 
 	redirect_uri VARCHAR(2048) 
diff --git a/openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql b/openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql
index 8d1716e7e..12653cf21 100644
--- a/openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql
+++ b/openid-connect-server/src/main/resources/db/tables/mysql_database_tables.sql
@@ -125,25 +125,11 @@ CREATE TABLE IF NOT EXISTS client_default_acr_value (
 	default_acr_value VARCHAR(2000)
 );
 
-CREATE TABLE IF NOT EXISTS client_nonce ( 
-	id BIGINT AUTO_INCREMENT PRIMARY KEY,
-	value VARCHAR(256),
-	client_id VARCHAR(256),
-	use_date TIMESTAMP NULL,
-	expire_date TIMESTAMP NULL
-);
-
 CREATE TABLE IF NOT EXISTS client_contact (
 	owner_id BIGINT,
 	contact VARCHAR(256)
 );
 
-CREATE TABLE IF NOT EXISTS event (
-	id BIGINT AUTO_INCREMENT PRIMARY KEY,
-	type INT(3),
-	timestamp DATE
-);
-
 CREATE TABLE IF NOT EXISTS client_redirect_uri (
 	owner_id BIGINT, 
 	redirect_uri VARCHAR(2048)