Further cool down email cleanup