Remove email support temporary