Remove the dependency on SASL