Remove a little more xray-related code.

On top of #2050