clean up + Tweaked Ondemand & Conservative Governor