Removed temp code to re-write emails