Revert "updated for new xray and pretest functions"

This reverts commit 85d10708821d0b0fe0bba5fc36e33720f937de02.