Jhelbert/enrollment mode change events

yes, removed