Remove in the summer after 2025 upgrade.