remove dependancy for Mail (oops)