Index: uspace/lib/c/generic/async/client.c
===================================================================
--- uspace/lib/c/generic/async/client.c	(revision 2f04bdd7af97cc89a84b0cb71167ec58aa9d1845)
+++ uspace/lib/c/generic/async/client.c	(revision 16d748ee929fdcbdaa98b949e62bf93baf2ddd32)
@@ -857,5 +857,5 @@
 	if (sess == NULL) {
 		ipc_hangup(phone);
-	}else {
+	} else {
 		sess->iface = iface;
 	}
@@ -915,5 +915,5 @@
 	if (sess == NULL) {
 		ipc_hangup(phone);
-	}else {
+	} else {
 		sess->iface = iface;
 	}
Index: uspace/lib/c/generic/async/server.c
===================================================================
--- uspace/lib/c/generic/async/server.c	(revision 2f04bdd7af97cc89a84b0cb71167ec58aa9d1845)
+++ uspace/lib/c/generic/async/server.c	(revision 16d748ee929fdcbdaa98b949e62bf93baf2ddd32)
@@ -216,18 +216,4 @@
 }
 
-static async_port_handler_t implicit_connection = NULL;
-
-/** Setter for implicit_connection function pointer.
- *
- * @param conn Function that will implement a new connection fibril for
- *             unrouted calls.
- *
- */
-void async_set_implicit_connection(async_port_handler_t conn)
-{
-	assert(implicit_connection == NULL);
-	implicit_connection = conn;
-}
-
 static fibril_rmutex_t client_mutex;
 static hash_table_t client_hash_table;
@@ -407,6 +393,4 @@
  *                    either a callback connection that was opened by
  *                    accepting the IPC_M_CONNECT_TO_ME call.
- *                    Alternatively, it is zero when we are opening
- *                    implicit connection.
  * @param handler     Connection handler.
  * @param data        Client argument to pass to the connection handler.
@@ -979,19 +963,8 @@
 	/* Route the call according to its request label */
 	errno_t rc = route_call(call);
-	if (rc == EOK) {
+	if (rc == EOK)
 		return;
-	} else if (implicit_connection != NULL) {
-		connection_t *conn = calloc(1, sizeof(connection_t));
-		if (!conn) {
-			ipc_answer_0(call->cap_handle, ENOMEM);
-			return;
-		}
-
-		async_new_connection(conn, call->task_id, call, implicit_connection, NULL);
-		return;
-	}
 
 	// TODO: Log the error.
-
 	if (call->cap_handle != CAP_NIL)
 		/* Unknown call from unknown phone - hang it up */
Index: uspace/lib/c/generic/taskman.c
===================================================================
--- uspace/lib/c/generic/taskman.c	(revision 2f04bdd7af97cc89a84b0cb71167ec58aa9d1845)
+++ uspace/lib/c/generic/taskman.c	(revision 16d748ee929fdcbdaa98b949e62bf93baf2ddd32)
@@ -69,5 +69,5 @@
 	async_exchange_end(exch);
 }
-#include <stdio.h>
+
 /** Wrap PHONE_INITIAL with session and introduce to taskman
  */
@@ -85,10 +85,7 @@
 		/* Introduce ourselves and ignore answer */
 		async_exch_t *exch = async_exchange_begin(sess);
-		aid_t req = async_send_0(exch, TASKMAN_NEW_TASK, NULL);
+		sess = async_connect_me_to(exch, INTERFACE_ANY,
+		    TASKMAN_NEW_TASK, 0);
 		async_exchange_end(exch);
-
-		if (req) {
-			async_forget(req);
-		}
 	}