Remove deprecated patch methods
Update events access (but this action is still mostly broken)
Reload stack prior to state check