Started cleaning up Mailbox