Removed singletons, and allowed thrid-party MailboxImpl
fixed some local conflict after pull