Remove admin and Inbox helpers, add Inbox manager