PIM-3277: clean managers and events
PIM-3277: renaming session