Cleanup
Improve mailbox performance