TLS/SSL enabled
Minor cleanup