22A clean-up