Rollback sendgrid changes

Rollback sendgrid changes - causes errors with live sendgrid. I kept the new functions in place but commented out so that they can be rewritten. MJ-719 MJ-732