Fix ZZ/ZZZ removal