Smtp clean up.
Smtp test, clean up