Simplify Ondemand

Remove and clean code for a better governor

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