drop cruft
more SASL bits