Remove XRay related stuff from codegen (fixes #1936)