trying to cleanup the email model and controllers