2023 code cleanup