HS cleanup 2023