Commented out the emails so I can merge fixes to master