Spring clean up 2022