Remove old XYZ class