diff --git a/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl b/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl
index fe3c710f2383b8f7efcef7cb19b09b9bb67fd385..a42bf5859b3682a16e3eceabaa516a87199eaa12 100644
--- a/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl
+++ b/apps/consul_proxy/src/consul_proxy_middleware_hijack.erl
@@ -100,7 +100,7 @@ loop(State = #socket_state{socket = Socket, transport = Transport, timeout = Tim
                     Transport:close(Socket)
             end;
         {error, closed} ->
-            ok;
+            gen_server:cast(?SERVER, {socket_close, Socket});
         {error, Reason} ->
             lager:error("Error receiving data: ~p", [Reason]),
             Transport:close(Socket)
@@ -170,13 +170,11 @@ handle_call(Request, _From, State) ->
 
 handle_cast({socket_open, Socket, Transport}, State) ->
     lager:notice("~p socket opened: ~p", [Transport, Socket]),
-    link(Socket),
     {noreply, State};
 
-handle_cast({socket_close, Socket, Reason}, State = #state{domain_tab = Tab}) ->
+handle_cast({socket_close, Socket}, State = #state{domain_tab = Tab}) ->
     ets:match_delete(Tab, {'_', '_', '_', Socket, '_'}),
-    lager:notice("Socket closed(~p): ~p", [Reason, Socket]),
-    unlink(Socket),
+    lager:notice("Socket closed: ~p", [Socket]),
     {noreply, State};
 
 handle_cast(Request, State) ->
diff --git a/apps/consul_proxy/src/consul_proxy_sup.erl b/apps/consul_proxy/src/consul_proxy_sup.erl
index 0cc93312454197df78bfec19d0e2b7cdad13d47f..281073368c0abd17174a1e888870c9960fe48360 100644
--- a/apps/consul_proxy/src/consul_proxy_sup.erl
+++ b/apps/consul_proxy/src/consul_proxy_sup.erl
@@ -57,8 +57,7 @@ init(Args) ->
     HijackListenerCount = application:get_env(consul_proxy, hijack_listeners, 100),
     HijackRanchOptions = [
         {port, application:get_env(consul_proxy, hijack_port, 8083)},
-        {certfile, application:get_env(consul_proxy, hijack_cert, "config/localhost.pem")},
-        {cacertfile, application:get_env(consul_proxy, hijack_cert, "config/ca.pem")}
+        {certfile, application:get_env(consul_proxy, hijack_cert, "config/localhost.pem")}
     ],
     HijackListenerSpec = ranch:child_spec(hijack_listener, HijackListenerCount,
         ranch_ssl, HijackRanchOptions,
diff --git a/config/ca.pem b/config/ca.pem
deleted file mode 100644
index 41d4dc70187415b6409eda396b83a30f98952f61..0000000000000000000000000000000000000000
--- a/config/ca.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE2TCCA8GgAwIBAgIJALb74VpZxuWCMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-VQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0x
-HjAcBgNVBAoTFUVyaWsncyBTZWxmLVNpZ25lZCBDQTEMMAoGA1UECxMDRGV2MRkw
-FwYDVQQDFBBFcmlrIEhlZGVuc3Ryw7ZtMSMwIQYJKoZIhvcNAQkBFhRlcmlrQGhl
-ZGVuc3Ryb2VtLmNvbTAeFw0xNTA5MTgxMzA5NDhaFw0xODA3MDgxMzA5NDhaMIGj
-MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9j
-a2hvbG0xHjAcBgNVBAoTFUVyaWsncyBTZWxmLVNpZ25lZCBDQTEMMAoGA1UECxMD
-RGV2MRkwFwYDVQQDFBBFcmlrIEhlZGVuc3Ryw7ZtMSMwIQYJKoZIhvcNAQkBFhRl
-cmlrQGhlZGVuc3Ryb2VtLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK0CS24Ip1/fB5CuXgVb/nmwJ1xAdPRw4jUNYI7eRz1gfzwGcXiKd+d2ysWv
-8U5MFnpFDaCCZxnVlx8E+qdPZRfoaTJ1gQx+TzBu8oqG/JxC1mpAY6BJqGAPijQ/
-sMgCs+DdT6Sjlc+RUWswCFSaAt46pqp7g3FmYxXz79tSvAnpyJRZ9ZxZSMJCfFgY
-dZg7QzNS13tE6kBqdADnps14HsjDayfNqcrevusmWiBtfVM0blX0pJLSeH7A2b0H
-KWvssr+w/7jZ82yBuIYFv2hB0qDrEojjpIPc3y++4jYIoWVDDfKFc5yth2ogt35Z
-mxiZiqiX7eY4XnHSkm2PwOzu+VkCAwEAAaOCAQwwggEIMB0GA1UdDgQWBBSjp2i6
-eNOfcRTMWe5OXw9bXVTekzCB2AYDVR0jBIHQMIHNgBSjp2i6eNOfcRTMWe5OXw9b
-XVTek6GBqaSBpjCBozELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTES
-MBAGA1UEBxMJU3RvY2tob2xtMR4wHAYDVQQKExVFcmlrJ3MgU2VsZi1TaWduZWQg
-Q0ExDDAKBgNVBAsTA0RldjEZMBcGA1UEAxQQRXJpayBIZWRlbnN0csO2bTEjMCEG
-CSqGSIb3DQEJARYUZXJpa0BoZWRlbnN0cm9lbS5jb22CCQC2++FaWcblgjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAcIq5uUrYjCoIUbVGrrWC+G6so
-F1y2naX1tO1r4So+yXnUzB7cwFHOdTXkLcwjbU+ErDyfpNiaGJ9J0nE7ik3BUUB/
-hSCL6AIOCy5KcVDhqqJ0bo5x79EmMB0PkoT6qSeUYU7p5iEuTSkG/IuPXx8UwbIB
-V97h3BJwGjbLn1BnPgYru6HMyVkxKAjgLjHd48CQmxjXdS696JN27lOh7FZ5l6QZ
-kUuPSi6csPT83zbIT1mdg/jzCWZ+bkqM6NI5kPQcSCLb5vJo7mVmchXrNUCKHmP9
-1+8mUw+7NOxpG2XwYPtXlcPGzmmaqGwmQbEiQOPc5wyc6xyR7kdYMCGmwIpp
------END CERTIFICATE-----