removed depricated mailbox api. few fixes