updates for flakey "turning on/off states

Ditched them, more of a PITA than anything