Remove invalid On and Off states; Fixes #9