Remove optional method
Merge branch 'iba_84_setup_mail_through_mail_service' into staging

* iba_84_setup_mail_through_mail_service:
  Remove optional method