Remove ondemandx

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>
Lionheart: Correct if not default

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>