diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/300-firewall-rules b/package/gluon-core/luasrc/lib/gluon/upgrade/300-firewall-rules
index 7b6c56274ddac25239c8da5e9f97f8ed59b01e38..897078ed52858b72f17e94cfe36ad663d54f998c 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/300-firewall-rules
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/300-firewall-rules
@@ -65,12 +65,6 @@ for _, zone in ipairs({'mesh', 'loc_client', 'wired_mesh'}) do
 	})
 end
 
--- ToDo Remove in v2022.x
-uci:delete('firewall', 'local_client')
-uci:delete('firewall', 'local_client_ssh')
-uci:delete('firewall', 'local_client_ICMPv4_in')
-uci:delete('firewall', 'local_client_ICMPv6_in')
-
 uci:section('firewall', 'rule', 'loc_client_ICMPv4_in', {
 	src = 'loc_client',
 	proto = 'icmp',
diff --git a/package/gluon-status-page/luasrc/lib/gluon/upgrade/500-status-page b/package/gluon-status-page/luasrc/lib/gluon/upgrade/500-status-page
index b5e7ce445ebd0682734e169458d1b59b910cf91e..9e54307e832b25043012af44f40d47e6edc0b01f 100755
--- a/package/gluon-status-page/luasrc/lib/gluon/upgrade/500-status-page
+++ b/package/gluon-status-page/luasrc/lib/gluon/upgrade/500-status-page
@@ -36,7 +36,4 @@ for _, zone in ipairs({'mesh', 'loc_client'}) do
 	})
 end
 
--- ToDo remove in v2022.x
-uci:delete('firewall', 'local_client_http')
-
 uci:save('firewall')