SSL support for client

Remove unnecessary use of Option