Remove some more xray code.
auto merge of #2051 : Ms2ger/servo/more-xray, r=jdm

On top of #2050