Revert "fixed intellidemand and smartmax, the others need work"

This reverts commit 43c97fc5274a15cef1aec1468fd582afbd04d2f4.