* 4.3: [4.3] Remove unused local variables
Drop the Smtp prefix so that arbitrary transports do not have to depend on SMTP specific concepts.