More SSL references and cleanup