Index: uspace/lib/hound/include/hound/client.h
===================================================================
--- uspace/lib/hound/include/hound/client.h	(revision 60e5696d7203fade9af5cc9727a0546015a01269)
+++ uspace/lib/hound/include/hound/client.h	(revision f46546181f7388c47e088fb11fb0afeab1efc34c)
@@ -43,5 +43,4 @@
 #define HOUND_DEFAULT_TARGET "default"
 #define HOUND_ALL_TARGETS "all"
-#define DEFAULT_SINK "default" //DEPRECATED
 
 typedef struct hound_context hound_context_t;
@@ -80,24 +79,3 @@
     pcm_format_t format, const void *data, size_t size);
 
-
-
-
-
-typedef async_sess_t hound_sess_t;
-
-typedef void (*data_callback_t)(void *, void *, ssize_t);
-
-hound_sess_t *hound_get_session(void);
-void hound_release_session(hound_sess_t *sess);
-int hound_register_playback(hound_sess_t *sess, const char *name,
-    unsigned channels, unsigned rate, pcm_sample_format_t format,
-    data_callback_t data_callback, void *arg);
-int hound_register_recording(hound_sess_t *sess, const char *name,
-    unsigned channels, unsigned rate, pcm_sample_format_t format,
-    data_callback_t data_callback, void *arg);
-int hound_unregister_playback(hound_sess_t *sess, const char *name);
-int hound_unregister_recording(hound_sess_t *sess, const char *name);
-int hound_create_connection(hound_sess_t *sess, const char *source, const char *sink);
-int hound_destroy_connection(hound_sess_t *sess, const char *source, const char *sink);
-
 #endif
Index: uspace/lib/hound/src/protocol.c
===================================================================
--- uspace/lib/hound/src/protocol.c	(revision 60e5696d7203fade9af5cc9727a0546015a01269)
+++ uspace/lib/hound/src/protocol.c	(revision f46546181f7388c47e088fb11fb0afeab1efc34c)
@@ -555,227 +555,4 @@
 
 /***
- * CLIENT SIDE -DEPRECATED
- ***/
-
-typedef struct {
-	data_callback_t cb;
-	void *arg;
-} callback_t;
-
-hound_sess_t *hound_get_session(void)
-{
-	return hound_service_connect(HOUND_SERVICE);
-}
-
-void hound_release_session(hound_sess_t *sess)
-{
-	hound_service_disconnect(sess);
-}
-
-
-static int hound_register(hound_sess_t *sess, unsigned cmd, const char *name,
-    unsigned channels, unsigned rate, pcm_sample_format_t format,
-    data_callback_t data_callback, void *arg);
-static int hound_unregister(hound_sess_t *sess, unsigned cmd, const char *name);
-static int hound_connection(hound_sess_t *sess, unsigned cmd,
-    const char *source, const char *sink);
-static void callback_pb(ipc_callid_t iid, ipc_call_t *call, void *arg);
-static void callback_rec(ipc_callid_t iid, ipc_call_t *call, void *arg);
-
-
-int hound_register_playback(hound_sess_t *sess, const char *name,
-    unsigned channels, unsigned rate, pcm_sample_format_t format,
-    data_callback_t data_callback, void *arg)
-{
-	return hound_register(sess, HOUND_REGISTER_PLAYBACK, name, channels,
-	    rate, format, data_callback, arg);
-}
-int hound_register_recording(hound_sess_t *sess, const char *name,
-    unsigned channels, unsigned rate, pcm_sample_format_t format,
-    data_callback_t data_callback, void *arg)
-{
-	return hound_register(sess, HOUND_REGISTER_RECORDING, name, channels,
-	    rate, format, data_callback, arg);
-
-}
-int hound_unregister_playback(hound_sess_t *sess, const char *name)
-{
-	return hound_unregister(sess, HOUND_UNREGISTER_PLAYBACK, name);
-}
-int hound_unregister_recording(hound_sess_t *sess, const char *name)
-{
-	return hound_unregister(sess, HOUND_UNREGISTER_RECORDING, name);
-}
-int hound_create_connection(hound_sess_t *sess, const char *source, const char *sink)
-{
-	return hound_connection(sess, HOUND_CONNECT, source, sink);
-}
-int hound_destroy_connection(hound_sess_t *sess, const char *source, const char *sink)
-{
-	return hound_connection(sess, HOUND_DISCONNECT, source, sink);
-}
-
-static int hound_register(hound_sess_t *sess, unsigned cmd, const char *name,
-    unsigned channels, unsigned rate, pcm_sample_format_t format,
-    data_callback_t data_callback, void *arg)
-{
-	assert(cmd == HOUND_REGISTER_PLAYBACK || cmd == HOUND_REGISTER_RECORDING);
-	if (!name || !data_callback || !sess)
-		return EINVAL;
-
-	async_exch_t *exch = async_exchange_begin(sess);
-	if (!exch)
-		return ENOMEM;
-
-	aid_t id = async_send_0(exch, cmd, NULL);
-
-	int ret = async_data_write_start(exch, name, str_size(name));
-	if (ret != EOK) {
-		async_forget(id);
-		async_exchange_end(exch);
-		return ret;
-	}
-
-	callback_t *cb = malloc(sizeof(callback_t));
-	if (!cb) {
-		async_forget(id);
-		async_exchange_end(exch);
-		return ENOMEM;
-	}
-
-	cb->cb = data_callback;
-	cb->arg = arg;
-	async_client_conn_t callback =
-	    (cmd == HOUND_REGISTER_PLAYBACK) ? callback_pb : callback_rec;
-
-	ret = async_connect_to_me(exch, channels, rate, format, callback, cb);
-	if (ret != EOK) {
-		async_forget(id);
-		async_exchange_end(exch);
-		free(cb);
-		return ret;
-	}
-
-	async_wait_for(id, (sysarg_t*)&ret);
-	if (ret != EOK) {
-		async_exchange_end(exch);
-		free(cb);
-		return ret;
-	}
-
-	async_exchange_end(exch);
-	return EOK;
-}
-
-static int hound_unregister(hound_sess_t *sess, unsigned cmd, const char *name)
-{
-	assert(cmd == HOUND_UNREGISTER_PLAYBACK || cmd == HOUND_UNREGISTER_RECORDING);
-	if (!name || !sess)
-		return EINVAL;
-
-	async_exch_t *exch = async_exchange_begin(sess);
-	if (!exch)
-		return ENOMEM;
-	aid_t id = async_send_0(exch, cmd, NULL);
-	sysarg_t ret = async_data_write_start(exch, name, str_size(name));
-	if (ret != EOK) {
-		async_forget(id);
-		async_exchange_end(exch);
-		return ret;
-	}
-
-	async_wait_for(id, &ret);
-	async_exchange_end(exch);
-	return ret;
-}
-
-static int hound_connection(hound_sess_t *sess, unsigned cmd,
-    const char *source, const char *sink)
-{
-	assert(cmd == HOUND_CONNECT || cmd == HOUND_DISCONNECT);
-	if (!source || !sink || !sess)
-		return EINVAL;
-
-	async_exch_t *exch = async_exchange_begin(sess);
-	if (!exch)
-		return ENOMEM;
-
-	aid_t id = async_send_0(exch, cmd, NULL);
-	sysarg_t ret = async_data_write_start(exch, source, str_size(source));
-	if (ret != EOK) {
-		async_forget(id);
-		async_exchange_end(exch);
-		return ret;
-	}
-	ret = async_data_write_start(exch, sink, str_size(sink));
-	if (ret != EOK) {
-		async_forget(id);
-		async_exchange_end(exch);
-		return ret;
-	}
-	async_wait_for(id, &ret);
-	async_exchange_end(exch);
-	return ret;
-}
-static void callback_gen(ipc_callid_t iid, ipc_call_t *call, void *arg,
-    bool read)
-{
-	async_answer_0(iid, EOK);
-	callback_t *cb = arg;
-	assert(cb);
-	void *buffer = NULL;
-	size_t buffer_size = 0;
-
-	bool (*receive)(ipc_callid_t *, size_t *) = read ?
-	    async_data_read_receive : async_data_write_receive;
-
-	while (1) {
-		size_t size = 0;
-		ipc_callid_t id = 0;
-		if (!receive(&id, &size)) {
-			ipc_call_t failed_call;
-			async_get_call(&failed_call);
-			/* Protocol error or hangup */
-			if (IPC_GET_IMETHOD(failed_call) != 0)
-				cb->cb(cb->arg, NULL, EIO);
-			free(cb);
-			return;
-		}
-
-		if (buffer_size < size) {
-			buffer = realloc(buffer, size);
-			if (!buffer) {
-				cb->cb(cb->arg, NULL, ENOMEM);
-				free(cb);
-				return;
-			}
-			buffer_size = size;
-		}
-		if (read)
-			cb->cb(cb->arg, buffer, size);
-		const int ret = read ?
-		    async_data_read_finalize(id, buffer, size):
-		    async_data_write_finalize(id, buffer, size);
-		if (ret != EOK) {
-			cb->cb(cb->arg, NULL, ret);
-			free(cb);
-			return;
-		}
-		if (!read)
-			cb->cb(cb->arg, buffer, size);
-	}
-}
-
-static void callback_pb(ipc_callid_t iid, ipc_call_t *call, void *arg)
-{
-	callback_gen(iid, call, arg, true);
-}
-
-static void callback_rec(ipc_callid_t iid, ipc_call_t *call, void *arg)
-{
-	callback_gen(iid, call, arg, false);
-}
-
-/***
  * SERVER SIDE - DEPRECATED
  ***/