Remove ondemandX and remainder of pegasusQ