Remove some more missed obsolete state-changed code