diff --git a/data/settings.js b/data/settings.js
index 162e01189..c2450e037 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -9321,9 +9321,6 @@ passdb passwd-file {
 
 	passdb_username_filter: {
 		tags: [ 'passdb' ],
-		added: {
-			settings_passdb_username_filter_added: false,
-		},
 		values: setting_types.STRING,
 		text: `
 Skip the passdb if non-empty and the username doesn't match the filter. This is
@@ -10117,10 +10114,6 @@ can be good values.`
 
 	service_idle_kill_interval: {
 		tags: [ 'service' ],
-		changed: {
-			settings_service_idle_kill_changed: `
-This behavior was redesigned to work better in busy servers.`,
-		},
 		values: setting_types.TIME,
 		default: '[[setting,default_idle_kill_interval]]',
 		text: `
diff --git a/data/updates.js b/data/updates.js
index b002e9182..5c19b7de8 100644
--- a/data/updates.js
+++ b/data/updates.js
@@ -19,7 +19,6 @@ export const updates = {
 	auth_client_common_secured: '2.4.0',
 	auth_imap_arg_configuration_removed: '2.4.0',
 	auth_lua_string_response_removed: '2.4.1',
-	auth_nss: '2.3.0',
 	auth_oauth2_no_passdb_changed: '2.4.0',
 	auth_policy_fail_type: '2.4.0',
 	auth_policy_reject: '2.4.0',
@@ -46,7 +45,6 @@ export const updates = {
 	imapc_features_no_search: '2.4.0',
 	imapsieve_filters: '2.4.0',
 	ja3_identifier: '2.4.0',
-	lazy_expunge_namespace: '2.3.0',
 	ldap_multi_added: '2.4.0',
 	lmtp_nologin_added: '2.4.0',
 	lua_auth_init: '2.4.0',
@@ -148,8 +146,6 @@ export const updates = {
 	settings_metric_fields_changed: '2.4.0',
 	settings_passdb_mechanisms_filter_added: '2.4.0',
 	settings_passdb_static_password_added: '2.4.0',
-	settings_passdb_username_filter_added: '2.2.30',
-	settings_service_idle_kill_changed: '2.3.21',
 	settings_ssl_client_ca_added: '2.4.0',
 	settings_ssl_imapc_removed: '2.4.0',
 	settings_ssl_request_client_cert_changed: '2.4.0',