Further cleanup: XSPEC