0.22 code cleanup