intro cleanups
sync with -smtp