More nit fixes
- Removed waiveXRays!

Change-Id: I4d1dc8e6b75240dc9d647a72f0b4e848cdb8adf2