diff --git a/oauth2/oauth2_auth_code_test.go b/oauth2/oauth2_auth_code_test.go
index aa6934062ed..cb12f68c1ab 100644
--- a/oauth2/oauth2_auth_code_test.go
+++ b/oauth2/oauth2_auth_code_test.go
@@ -165,7 +165,7 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 					GrantAccessTokenAudience: rr.RequestedAccessTokenAudience,
 					Session: &hydra.AcceptOAuth2ConsentRequestSession{
 						AccessToken: map[string]interface{}{"foo": "bar"},
-						IdToken:     map[string]interface{}{"bar": "baz"},
+						IdToken:     map[string]interface{}{"bar": "baz", "email": "foo@bar.com"},
 					},
 				}).
 				Execute()
@@ -206,6 +206,8 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 		assert.EqualValues(t, expectedSubject, claims.Get("sub").String(), "%s", claims)
 		assert.EqualValues(t, expectedNonce, claims.Get("nonce").String(), "%s", claims)
 		assert.EqualValues(t, `baz`, claims.Get("bar").String(), "%s", claims)
+		assert.EqualValues(t, `foo@bar.com`, claims.Get("email").String(), "%s", claims)
+		assert.NotEmpty(t, claims.Get("sid").String(), "%s", claims)
 
 		return claims
 	}
diff --git a/persistence/sql/migrations/20241012144910000001_unused_indices.down.sql b/persistence/sql/migrations/20241012144910000001_unused_indices.down.sql
new file mode 100644
index 00000000000..ea765c5859b
--- /dev/null
+++ b/persistence/sql/migrations/20241012144910000001_unused_indices.down.sql
@@ -0,0 +1,14 @@
+-- CREATE INDEX IF NOT EXISTS hydra_oauth2_access_client_id_subject_idx ON hydra_oauth2_access (client_id ASC, subject ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS hydra_oauth2_access_expires_at_v2_idx ON hydra_oauth2_access (expires_at ASC);
+
+CREATE INDEX IF NOT EXISTS hydra_oauth2_refresh_client_id_subject_idx ON hydra_oauth2_refresh (client_id ASC, subject ASC);
+CREATE INDEX IF NOT EXISTS hydra_oauth2_refresh_expires_at_v2_idx ON hydra_oauth2_refresh (expires_at ASC);
+
+CREATE INDEX IF NOT EXISTS hydra_oauth2_pkce_request_id_idx ON hydra_oauth2_pkce (request_id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS hydra_oauth2_pkce_expires_at_v2_idx ON hydra_oauth2_pkce (expires_at ASC);
+
+CREATE INDEX IF NOT EXISTS hydra_oauth2_oidc_request_id_idx ON hydra_oauth2_oidc (request_id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS hydra_oauth2_oidc_expires_at_idx ON hydra_oauth2_oidc (expires_at ASC);
+
+CREATE INDEX IF NOT EXISTS hydra_oauth2_pkce_request_id_idx ON hydra_oauth2_code (request_id ASC, nid ASC);
+CREATE INDEX IF NOT EXISTS hydra_oauth2_pkce_expires_at_v2_idx ON hydra_oauth2_code (expires_at ASC);
diff --git a/persistence/sql/migrations/20241012144910000001_unused_indices.mysql.up.sql b/persistence/sql/migrations/20241012144910000001_unused_indices.mysql.up.sql
new file mode 100644
index 00000000000..83ae09f7edf
--- /dev/null
+++ b/persistence/sql/migrations/20241012144910000001_unused_indices.mysql.up.sql
@@ -0,0 +1,14 @@
+-- DROP INDEX hydra_oauth2_access_client_id_subject_idx ON hydra_oauth2_access;
+DROP INDEX hydra_oauth2_access_expires_at_v2_idx ON hydra_oauth2_access; -- janitor still uses requested_at index
+
+DROP INDEX hydra_oauth2_refresh_client_id_subject_idx ON hydra_oauth2_refresh;
+DROP INDEX hydra_oauth2_refresh_expires_at_v2_idx ON hydra_oauth2_refresh; -- janitor still uses requested_at index
+
+DROP INDEX hydra_oauth2_pkce_request_id_idx ON hydra_oauth2_pkce;
+DROP INDEX hydra_oauth2_pkce_expires_at_v2_idx ON hydra_oauth2_pkce; -- janitor still uses requested_at index
+
+DROP INDEX hydra_oauth2_oidc_request_id_idx ON hydra_oauth2_oidc;
+DROP INDEX hydra_oauth2_oidc_expires_at_idx ON hydra_oauth2_oidc; -- janitor still uses requested_at index
+
+DROP INDEX hydra_oauth2_code_request_id_idx ON hydra_oauth2_code;
+DROP INDEX hydra_oauth2_code_expires_at_v2_idx ON hydra_oauth2_code; -- janitor still uses requested_at index
diff --git a/persistence/sql/migrations/20241012144910000001_unused_indices.up.sql b/persistence/sql/migrations/20241012144910000001_unused_indices.up.sql
new file mode 100644
index 00000000000..ac2ba6ebf8b
--- /dev/null
+++ b/persistence/sql/migrations/20241012144910000001_unused_indices.up.sql
@@ -0,0 +1,14 @@
+DROP INDEX IF EXISTS hydra_oauth2_access_client_id_subject_idx;
+DROP INDEX IF EXISTS hydra_oauth2_access_expires_at_v2_idx; -- janitor still uses requested_at index
+
+DROP INDEX IF EXISTS hydra_oauth2_refresh_client_id_subject_idx;
+DROP INDEX IF EXISTS hydra_oauth2_refresh_expires_at_v2_idx; -- janitor still uses requested_at index
+
+DROP INDEX IF EXISTS hydra_oauth2_pkce_request_id_idx;
+DROP INDEX IF EXISTS hydra_oauth2_pkce_expires_at_v2_idx; -- janitor still uses requested_at index
+
+DROP INDEX IF EXISTS hydra_oauth2_oidc_request_id_idx;
+DROP INDEX IF EXISTS hydra_oauth2_oidc_expires_at_idx; -- janitor still uses requested_at index
+
+DROP INDEX IF EXISTS hydra_oauth2_code_request_id_idx;
+DROP INDEX IF EXISTS hydra_oauth2_code_expires_at_v2_idx; -- janitor still uses requested_at index