Use the public deactivate callback rather than the private exit

We should also use the "activate" method instead of "enter"...