Cleaned XYZ in debug and other stuff