Jhelbert/enrollment mode change events

correct, it is removed