Remove `smtpOrig`, we don't really need it for now.
Add constraints araising from improvement.