Replace sensors/controls/classes with just vars