Use HAS_SASL constant
Remove uneeded platform definition
Cleanup after code review