some cleanup and SASL start (work in progress)