fix ondemand governor
clean-up some cabbage