Revert "Update #654 - added null check around remove_StateChange event"

This reverts commit 832a206acd5a758dae6738a6d2d6a9c3291f4451.