Got rid of email dependencies