diff --git a/src/libp2p_session.erl b/src/libp2p_session.erl
index 91d3266d..0ea239cd 100644
--- a/src/libp2p_session.erl
+++ b/src/libp2p_session.erl
@@ -6,7 +6,7 @@
 
 -export_type([stream_handler/0]).
 
--export([ping/1, open/1, close/1, close/3, close_state/1, goaway/1, streams/1, addr_info/2, identify/3]).
+-export([ping/1, open/1, close/1, close/2, close_state/1, goaway/1, streams/1, addr_info/2, identify/3]).
 
 -export([dial/2, dial_framed_stream/4]).
 
@@ -23,7 +23,11 @@ open(Pid) ->
 
 -spec close(pid()) -> ok.
 close(Pid) ->
-    try close(Pid, normal, 5000) of
+    close(Pid, normal).
+
+-spec close(pid(), term()) -> ok.
+close(Pid, Reason) ->
+    try close(Pid, Reason, 5000) of
         Res -> Res
     catch
         exit:timeout ->
diff --git a/src/libp2p_swarm_server.erl b/src/libp2p_swarm_server.erl
index 980f445c..1002490f 100644
--- a/src/libp2p_swarm_server.erl
+++ b/src/libp2p_swarm_server.erl
@@ -117,12 +117,9 @@ handle_cast(Msg, State) ->
     lager:warning("Unhandled cast: ~p", [Msg]),
     {noreply, State}.
 
-
-terminate(Reason, #state{tid=TID}) ->
-    lists:foreach(fun({Addr, Pid}) ->
-                          libp2p_config:remove_session(TID, Addr),
-                          catch libp2p_session:close(Pid, Reason, infinity)
-                  end, libp2p_config:lookup_sessions(TID)).
+terminate(Reason, _State) ->
+    lager:warning("going down ~p", [Reason]),
+    ok.
 
 %% Internal
 %%