Remove some debugging and switch to xz