Revert "Add in xondemand"

This reverts commit da48998ac65359a94b214e24809641156cd78285.