code clean, remove unnessesary mail sender