[2/2] Pull code cleanup v1

For some reason it didn't record this as part of the other change

Created by  dblsaiko  on April 7, 2024
M32SWK6ZR3ZXXQCCGFCE4DZQIDKUGHESHECI6R2Q5WQLRWV52NTAC
Dependencies
In channels
main
Change contents