77 files changed, 0 insertions, 15853 deletions

diff --git a/src/messenger/.gitignore b/src/messenger/.gitignore
deleted file mode 100644
index ed78c5562..000000000
--- a/src/messenger/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-gnunet-service-messenger
-gnunet-messenger
-test_messenger_api
-test_messenger_anonymous
-test_messenger_sync_client
-test_messenger_async_client
-test_messenger_worst_client
-test_messenger_sync_p2p
-test_messenger_async_p2p
-test_messenger_worst_p2p
-test_messenger_server
-test_messenger_growth
-test_messenger_ring
-test_messenger_adapt
diff --git a/src/messenger/Makefile.am b/src/messenger/Makefile.am
deleted file mode 100644
index 3fc532e7e..000000000
--- a/src/messenger/Makefile.am
+++ /dev/null
@@ -1,222 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  messenger.conf
-
-plugindir = $(libdir)/gnunet
-
-AM_CLFAGS = -g
-
-libexec_PROGRAMS = \
- gnunet-service-messenger \
- $(EXP_LIBEXEC)
-
-bin_PROGRAMS = \
- gnunet-messenger
-
-lib_LTLIBRARIES = \
-  libgnunetmessenger.la \
-  $(EXP_LIB)
-
-libgnunetmessenger_la_SOURCES = \
-  messenger_api.c \
-  messenger_api_ego.h \
-  messenger_api_contact.c messenger_api_contact.h \
-  messenger_api_contact_store.c messenger_api_contact_store.h \
-  messenger_api_message.c messenger_api_message.h \
-  messenger_api_list_tunnels.c messenger_api_list_tunnels.h \
-  messenger_api_util.c messenger_api_util.h \
-  messenger_api_handle.c messenger_api_handle.h \
-  messenger_api_room.c messenger_api_room.h
-libgnunetmessenger_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetmessenger_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-gnunet_messenger_SOURCES = \
- gnunet-messenger.c
-gnunet_messenger_LDADD = \
- libgnunetmessenger.la \
- $(top_builddir)/src/util/libgnunetutil.la
-gnunet_messenger_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_service_messenger_SOURCES = \
-  gnunet-service-messenger.c gnunet-service-messenger.h \
-  gnunet-service-messenger_service.c gnunet-service-messenger_service.h \
-  gnunet-service-messenger_list_handles.c gnunet-service-messenger_list_handles.h \
-  gnunet-service-messenger_list_messages.c gnunet-service-messenger_list_messages.h \
-  gnunet-service-messenger_member_session.c gnunet-service-messenger_member_session.h \
-  gnunet-service-messenger_member.c gnunet-service-messenger_member.h \
-  gnunet-service-messenger_member_store.c gnunet-service-messenger_member_store.h \
-  gnunet-service-messenger_message_handle.c gnunet-service-messenger_message_handle.h \
-  gnunet-service-messenger_message_kind.c gnunet-service-messenger_message_kind.h \
-  gnunet-service-messenger_message_recv.c gnunet-service-messenger_message_recv.h \
-  gnunet-service-messenger_message_send.c gnunet-service-messenger_message_send.h \
-  gnunet-service-messenger_message_state.c gnunet-service-messenger_message_state.h \
-  gnunet-service-messenger_message_store.c gnunet-service-messenger_message_store.h \
-  gnunet-service-messenger_operation_store.c gnunet-service-messenger_operation_store.h \
-  gnunet-service-messenger_operation.c gnunet-service-messenger_operation.h \
-  gnunet-service-messenger_basement.c gnunet-service-messenger_basement.h \
-  gnunet-service-messenger_ego_store.c gnunet-service-messenger_ego_store.h \
-  gnunet-service-messenger_handle.c gnunet-service-messenger_handle.h \
-  gnunet-service-messenger_room.c gnunet-service-messenger_room.h \
-  gnunet-service-messenger_tunnel.c gnunet-service-messenger_tunnel.h
-gnunet_service_messenger_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/identity/libgnunetidentity.la \
-  $(GN_LIBINTL)
-
-check_PROGRAMS = \
-  test_messenger_api \
-  test_messenger_anonymous \
-  test_messenger_sync_client \
-  test_messenger_async_client \
-  test_messenger_worst_client \
-  test_messenger_sync_p2p \
-  test_messenger_async_p2p \
-  test_messenger_worst_p2p \
-  test_messenger_server \
-  test_messenger_growth \
-  test_messenger_ring \
-  test_messenger_adapt
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
- $(check_PROGRAMS)
-endif
-
-test_messenger_api_SOURCES = \
-  test_messenger.c
-test_messenger_api_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-test_messenger_anonymous_SOURCES = \
-  test_messenger_anonymous.c
-test_messenger_anonymous_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-test_messenger_sync_client_SOURCES = \
-  test_messenger_sync_client.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_sync_client_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_async_client_SOURCES = \
-  test_messenger_async_client.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_async_client_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_worst_client_SOURCES = \
-  test_messenger_worst_client.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_worst_client_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-test_messenger_sync_p2p_SOURCES = \
-  test_messenger_sync_p2p.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_sync_p2p_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_async_p2p_SOURCES = \
-  test_messenger_async_p2p.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_async_p2p_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-test_messenger_worst_p2p_SOURCES = \
-  test_messenger_worst_p2p.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_worst_p2p_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_server_SOURCES = \
-  test_messenger_server.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_server_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_growth_SOURCES = \
-  test_messenger_growth.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_growth_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_ring_SOURCES = \
-  test_messenger_ring.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_ring_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-  
-test_messenger_adapt_SOURCES = \
-  test_messenger_adapt.c \
-  testing_messenger_barrier.c testing_messenger_barrier.h \
-  testing_messenger_setup.c testing_messenger_setup.h
-test_messenger_adapt_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_messenger_api.conf
diff --git a/src/messenger/gnunet-messenger.c b/src/messenger/gnunet-messenger.c
deleted file mode 100644
index 28fa4b147..000000000
--- a/src/messenger/gnunet-messenger.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-messenger.c
- * @brief Print information about messenger groups.
- */
-
-#include <stdio.h>
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_messenger_service.h"
-
-struct GNUNET_MESSENGER_Handle *messenger;
-
-/**
- * Function called whenever a message is received or sent.
- *
- * @param[in/out] cls Closure
- * @param[in] room Room
- * @param[in] sender Sender of message
- * @param[in] message Message
- * @param[in] hash Hash of message
- * @param[in] flags Flags of message
- */
-void
-on_message (void *cls, struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Contact *sender,
-            const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash,
-            enum GNUNET_MESSENGER_MessageFlags flags)
-{
-  const char *sender_name = GNUNET_MESSENGER_contact_get_name (sender);
-
-  if (!sender_name)
-    sender_name = "anonymous";
-
-  printf ("[%s] ", GNUNET_sh2s(&(message->header.sender_id)));
-
-  if (flags & GNUNET_MESSENGER_FLAG_PRIVATE)
-    printf ("*");
-
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_JOIN:
-    {
-      printf ("* '%s' joined the room!\n", sender_name);
-      break;
-    }
-  case GNUNET_MESSENGER_KIND_NAME:
-    {
-      printf ("* '%s' gets renamed to '%s'\n", sender_name, message->body.name.name);
-      break;
-    }
-  case GNUNET_MESSENGER_KIND_LEAVE:
-    {
-      printf ("* '%s' leaves the room!\n", sender_name);
-      break;
-    }
-  case GNUNET_MESSENGER_KIND_PEER:
-    {
-      printf ("* '%s' opened the room on: %s\n", sender_name, GNUNET_i2s_full (&(message->body.peer.peer)));
-      break;
-    }
-  case GNUNET_MESSENGER_KIND_TEXT:
-    {
-      if (flags & GNUNET_MESSENGER_FLAG_SENT)
-        printf (">");
-      else
-        printf ("<");
-
-      printf (" '%s' says: \"%s\"\n", sender_name, message->body.text.text);
-      break;
-    }
-  default:
-    {
-      printf ("~ message: %s\n", GNUNET_MESSENGER_name_of_kind(message->header.kind));
-      break;
-    }
-  }
-}
-
-struct GNUNET_SCHEDULER_Task *read_task;
-
-/**
- * Task to shut down this application.
- *
- * @param[in/out] cls Closure
- */
-static void
-shutdown_hook (void *cls)
-{
-  struct GNUNET_MESSENGER_Room *room = cls;
-
-  if (read_task)
-    GNUNET_SCHEDULER_cancel (read_task);
-
-  if (room)
-    GNUNET_MESSENGER_close_room (room);
-
-  if (messenger)
-    GNUNET_MESSENGER_disconnect (messenger);
-}
-
-static void
-listen_stdio (void *cls);
-
-#define MAX_BUFFER_SIZE 60000
-
-static int
-iterate_send_private_message (void *cls, struct GNUNET_MESSENGER_Room *room,
-                              const struct GNUNET_MESSENGER_Contact *contact)
-{
-  struct GNUNET_MESSENGER_Message *message = cls;
-
-  if (GNUNET_MESSENGER_contact_get_key(contact))
-    GNUNET_MESSENGER_send_message (room, message, contact);
-
-  return GNUNET_YES;
-}
-
-int private_mode;
-
-/**
- * Task run in stdio mode, after some data is available at stdin.
- *
- * @param[in/out] cls Closure
- */
-static void
-read_stdio (void *cls)
-{
-  read_task = NULL;
-
-  char buffer[MAX_BUFFER_SIZE];
-  ssize_t length;
-
-  length = read (0, buffer, MAX_BUFFER_SIZE);
-
-  if ((length <= 0) || (length >= MAX_BUFFER_SIZE))
-  {
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  if (buffer[length - 1] == '\n')
-    buffer[length - 1] = '\0';
-  else
-    buffer[length] = '\0';
-
-  struct GNUNET_MESSENGER_Room *room = cls;
-
-  struct GNUNET_MESSENGER_Message message;
-  message.header.kind = GNUNET_MESSENGER_KIND_TEXT;
-  message.body.text.text = buffer;
-
-  if (GNUNET_YES == private_mode)
-    GNUNET_MESSENGER_iterate_members(room, iterate_send_private_message, &message);
-  else
-    GNUNET_MESSENGER_send_message (room, &message, NULL);
-
-  read_task = GNUNET_SCHEDULER_add_now (listen_stdio, cls);
-}
-
-/**
- * Wait for input on STDIO and send it out over the #ch.
- *
- * @param[in/out] cls Closure
- */
-static void
-listen_stdio (void *cls)
-{
-  read_task = NULL;
-
-  struct GNUNET_NETWORK_FDSet *rs = GNUNET_NETWORK_fdset_create ();
-
-  GNUNET_NETWORK_fdset_set_native (rs, 0);
-
-  read_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                           GNUNET_TIME_UNIT_FOREVER_REL, rs,
-                                           NULL, &read_stdio, cls);
-
-  GNUNET_NETWORK_fdset_destroy (rs);
-}
-
-/**
- * Initial task to startup application.
- *
- * @param[in/out] cls Closure
- */
-static void
-idle (void *cls)
-{
-  struct GNUNET_MESSENGER_Room *room = cls;
-
-  printf ("* You joined the room.\n");
-
-  read_task = GNUNET_SCHEDULER_add_now (listen_stdio, room);
-}
-
-char *door_id;
-char *ego_name;
-char *room_key;
-
-struct GNUNET_SCHEDULER_Task *shutdown_task;
-
-/**
- * Function called when an identity is retrieved.
- *
- * @param[in/out] cls Closure
- * @param[in/out] handle Handle of messenger service
- */
-static void
-on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
-{
-  struct GNUNET_HashCode key;
-  memset (&key, 0, sizeof(key));
-
-  if (room_key)
-    GNUNET_CRYPTO_hash (room_key, strlen (room_key), &key);
-
-  struct GNUNET_PeerIdentity door_peer;
-  struct GNUNET_PeerIdentity *door = NULL;
-
-  if ((door_id) &&
-      (GNUNET_OK == GNUNET_CRYPTO_eddsa_public_key_from_string (door_id, strlen (door_id), &(door_peer.public_key))))
-    door = &door_peer;
-
-  const char *name = GNUNET_MESSENGER_get_name (handle);
-
-  if (!name)
-    name = "anonymous";
-
-  printf ("* Welcome to the messenger, '%s'!\n", name);
-
-  struct GNUNET_MESSENGER_Room *room;
-
-  if (door)
-  {
-    printf ("* You try to entry a room...\n");
-
-    room = GNUNET_MESSENGER_enter_room (messenger, door, &key);
-  }
-  else
-  {
-    printf ("* You try to open a room...\n");
-
-    room = GNUNET_MESSENGER_open_room (messenger, &key);
-  }
-
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-
-  shutdown_task = GNUNET_SCHEDULER_add_shutdown (shutdown_hook, room);
-
-  if (!room)
-    GNUNET_SCHEDULER_shutdown ();
-  else
-  {
-    struct GNUNET_MESSENGER_Message message;
-    message.header.kind = GNUNET_MESSENGER_KIND_NAME;
-    message.body.name.name = GNUNET_strdup(name);
-
-    GNUNET_MESSENGER_send_message (room, &message, NULL);
-    GNUNET_free(message.body.name.name);
-
-    GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_relative_get_zero_ (), GNUNET_SCHEDULER_PRIORITY_IDLE, idle,
-                                                room);
-  }
-}
-
-/**
- * Main function that will be run by the scheduler.
- *
- * @param[in/out] cls closure
- * @param[in] args remaining command-line arguments
- * @param[in] cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param[in] cfg configuration
- */
-static void
-run (void *cls, char *const*args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  messenger = GNUNET_MESSENGER_connect (cfg, ego_name, &on_identity, NULL, &on_message, NULL);
-
-  shutdown_task = GNUNET_SCHEDULER_add_shutdown (shutdown_hook, NULL);
-}
-
-/**
- * The main function to obtain messenger information.
- *
- * @param[in] argc number of arguments from the command line
- * @param[in] argv command line arguments
- * @return #EXIT_SUCCESS ok, #EXIT_FAILURE on error
- */
-int
-main (int argc, char **argv)
-{
-  const char *description = "Open and connect to rooms using the MESSENGER to chat.";
-
-  struct GNUNET_GETOPT_CommandLineOption options[] =
-  {
-    GNUNET_GETOPT_option_string ('d', "door", "PEERIDENTITY", "peer identity to entry into the room", &door_id),
-    GNUNET_GETOPT_option_string ('e', "ego", "IDENTITY", "identity to use for messaging", &ego_name),
-    GNUNET_GETOPT_option_string ('r', "room", "ROOMKEY", "key of the room to connect to", &room_key),
-    GNUNET_GETOPT_option_flag ('p', "private", "flag to enable private mode", &private_mode),
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  return (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-messenger\0", gettext_noop(description), options, &run,
-  NULL) ? EXIT_SUCCESS : EXIT_FAILURE);
-}
diff --git a/src/messenger/gnunet-service-messenger.c b/src/messenger/gnunet-service-messenger.c
deleted file mode 100644
index 7edd76d32..000000000
--- a/src/messenger/gnunet-service-messenger.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger.h"
-
-#include "gnunet-service-messenger_handle.h"
-#include "gnunet-service-messenger_message_kind.h"
-#include "gnunet-service-messenger_service.h"
-#include "messenger_api_message.h"
-
-struct GNUNET_MESSENGER_Client
-{
-  struct GNUNET_SERVICE_Client *client;
-  struct GNUNET_MESSENGER_SrvHandle *handle;
-};
-
-struct GNUNET_MESSENGER_Service *messenger;
-
-static int
-check_create (void *cls, const struct GNUNET_MESSENGER_CreateMessage *msg)
-{
-  GNUNET_MQ_check_zero_termination(msg);
-  return GNUNET_OK;
-}
-
-static void
-handle_create (void *cls, const struct GNUNET_MESSENGER_CreateMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  const char *name = ((const char*) msg) + sizeof(*msg);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Handle created with name: %s\n", name);
-
-  setup_handle_name (msg_client->handle, strlen (name) > 0 ? name : NULL);
-
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void
-handle_update (void *cls, const struct GNUNET_MESSENGER_UpdateMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  update_handle (msg_client->handle);
-
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void
-handle_destroy (void *cls, const struct GNUNET_MESSENGER_DestroyMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  GNUNET_SERVICE_client_drop (msg_client->client);
-}
-
-static int
-check_set_name (void *cls, const struct GNUNET_MESSENGER_NameMessage *msg)
-{
-  GNUNET_MQ_check_zero_termination(msg);
-  return GNUNET_OK;
-}
-
-static void
-handle_set_name (void *cls, const struct GNUNET_MESSENGER_NameMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  const char *name = ((const char*) msg) + sizeof(*msg);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Handles name is now: %s\n", name);
-
-  set_handle_name (msg_client->handle, name);
-
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void
-handle_room_open (void *cls, const struct GNUNET_MESSENGER_RoomMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Opening room: %s\n", GNUNET_h2s (&(msg->key)));
-
-  if (GNUNET_YES == open_handle_room (msg_client->handle, &(msg->key)))
-  {
-    const struct GNUNET_ShortHashCode *member_id = get_handle_member_id (msg_client->handle, &(msg->key));
-
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Opening room with member id: %s\n", GNUNET_sh2s (member_id));
-
-    struct GNUNET_MESSENGER_RoomMessage *response;
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_msg(response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN);
-    GNUNET_memcpy(&(response->key), &(msg->key), sizeof(msg->key));
-    GNUNET_MQ_send (msg_client->handle->mq, env);
-  }
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Opening room failed: %s\n", GNUNET_h2s (&(msg->key)));
-
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void
-handle_room_entry (void *cls, const struct GNUNET_MESSENGER_RoomMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Entering room: %s, %s\n", GNUNET_h2s (&(msg->key)), GNUNET_i2s (&(msg->door)));
-
-  if (GNUNET_YES == entry_handle_room (msg_client->handle, &(msg->door), &(msg->key)))
-  {
-    const struct GNUNET_ShortHashCode *member_id = get_handle_member_id (msg_client->handle, &(msg->key));
-
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Entering room with member id: %s\n", GNUNET_sh2s (member_id));
-
-    struct GNUNET_MESSENGER_RoomMessage *response;
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_msg(response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY);
-    GNUNET_memcpy(&(response->door), &(msg->door), sizeof(msg->door));
-    GNUNET_memcpy(&(response->key), &(msg->key), sizeof(msg->key));
-    GNUNET_MQ_send (msg_client->handle->mq, env);
-  }
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Entrance into room failed: %s, %s\n", GNUNET_h2s (&(msg->key)),
-               GNUNET_i2s (&(msg->door)));
-
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void
-handle_room_close (void *cls, const struct GNUNET_MESSENGER_RoomMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Closing room: %s\n", GNUNET_h2s (&(msg->key)));
-
-  if (GNUNET_YES == close_handle_room (msg_client->handle, &(msg->key)))
-  {
-    const struct GNUNET_ShortHashCode *member_id = get_handle_member_id (msg_client->handle, &(msg->key));
-
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Closing room with member id: %s\n", GNUNET_sh2s (member_id));
-
-    struct GNUNET_MESSENGER_RoomMessage *response;
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_msg(response, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE);
-    GNUNET_memcpy(&(response->key), &(msg->key), sizeof(msg->key));
-    GNUNET_MQ_send (msg_client->handle->mq, env);
-  }
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Closing room failed: %s\n", GNUNET_h2s (&(msg->key)));
-
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static int
-check_send_message (void *cls, const struct GNUNET_MESSENGER_SendMessage *msg)
-{
-  const uint16_t full_length = ntohs (msg->header.size);
-
-  if (full_length < sizeof(*msg))
-    return GNUNET_NO;
-
-  const enum GNUNET_MESSENGER_MessageFlags flags = (
-      (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
-  );
-
-  const uint16_t length = full_length - sizeof(*msg);
-  const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  ssize_t key_length = 0;
-
-  if (!(flags & GNUNET_MESSENGER_FLAG_PRIVATE))
-    goto check_for_message;
-
-  struct GNUNET_IDENTITY_PublicKey public_key;
-
-  key_length = GNUNET_IDENTITY_read_key_from_buffer(&public_key, buffer, length);
-
-check_for_message:
-  if (key_length < 0)
-    return GNUNET_NO;
-
-  const uint16_t msg_length = length - key_length;
-  const char* msg_buffer = buffer + key_length;
-
-  struct GNUNET_MESSENGER_Message message;
-
-  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN))
-    return GNUNET_NO;
-
-  if (GNUNET_YES != decode_message (&message, msg_length, msg_buffer, GNUNET_NO, NULL))
-    return GNUNET_NO;
-
-  if (GNUNET_YES != filter_message_sending(&message))
-    return GNUNET_NO;
-
-  return GNUNET_OK;
-}
-
-static void
-handle_send_message (void *cls, const struct GNUNET_MESSENGER_SendMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  const enum GNUNET_MESSENGER_MessageFlags flags = (
-      (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
-  );
-
-  const struct GNUNET_HashCode *key = &(msg->key);
-  const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  const uint16_t length = ntohs (msg->header.size) - sizeof(*msg);
-  ssize_t key_length = 0;
-
-  struct GNUNET_IDENTITY_PublicKey public_key;
-
-  if (flags & GNUNET_MESSENGER_FLAG_PRIVATE)
-    key_length = GNUNET_IDENTITY_read_key_from_buffer(
-        &public_key, buffer, length
-    );
-
-  const uint16_t msg_length = length - key_length;
-  const char* msg_buffer = buffer + key_length;
-
-  struct GNUNET_MESSENGER_Message message;
-  decode_message (&message, msg_length, msg_buffer, GNUNET_NO, NULL);
-
-  if ((flags & GNUNET_MESSENGER_FLAG_PRIVATE) &&
-      (GNUNET_YES != encrypt_message(&message, &public_key)))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Encrypting message failed: Message got dropped!\n");
-
-    goto end_handling;
-  }
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending message: %s to %s\n",
-             GNUNET_MESSENGER_name_of_kind (message.header.kind), GNUNET_h2s (key));
-
-  if (GNUNET_YES != send_handle_message (msg_client->handle, key, &message))
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sending message failed: %s to %s\n",
-               GNUNET_MESSENGER_name_of_kind (message.header.kind), GNUNET_h2s (key));
-
-end_handling:
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void
-callback_found_message (void *cls, struct GNUNET_MESSENGER_SrvRoom *room,
-                        const struct GNUNET_MESSENGER_Message *message,
-                        const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  if (!message)
-  {
-    send_room_message(room, msg_client->handle, create_message_request(hash));
-    return;
-  }
-
-  struct GNUNET_MESSENGER_MemberStore *store = get_room_member_store(room);
-
-  struct GNUNET_MESSENGER_Member *member = get_store_member_of(store, message);
-
-  if (!member)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sender of message (%s) unknown!\n", GNUNET_h2s (hash));
-    return;
-  }
-
-  struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of(member, message, hash);
-
-  if (session)
-    notify_handle_message (msg_client->handle, get_room_key(room), session, message, hash);
-}
-
-static void
-handle_get_message (void *cls, const struct GNUNET_MESSENGER_GetMessage *msg)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Requesting message from room: %s\n", GNUNET_h2s (&(msg->key)));
-
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (messenger, &(msg->key));
-
-  if (!room)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Room not found: %s\n", GNUNET_h2s (&(msg->key)));
-    goto end_handling;
-  }
-
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-
-  struct GNUNET_MESSENGER_Member *member = get_store_member(member_store, get_handle_member_id(
-      msg_client->handle, &(msg->key)
-  ));
-
-  if (!member)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Member not valid to request a message!\n");
-    goto end_handling;
-  }
-
-  struct GNUNET_MESSENGER_MemberSession *session = get_member_session(member, &(get_handle_ego(msg_client->handle)->pub));
-
-  if (!session)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Session not valid to request a message!\n");
-    goto end_handling;
-  }
-
-  request_room_message (room, &(msg->hash), session, callback_found_message, msg_client);
-
-end_handling:
-  GNUNET_SERVICE_client_continue (msg_client->client);
-}
-
-static void*
-callback_client_connect (void *cls, struct GNUNET_SERVICE_Client *client, struct GNUNET_MQ_Handle *mq)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = GNUNET_new(struct GNUNET_MESSENGER_Client);
-
-  msg_client->client = client;
-  msg_client->handle = add_service_handle (messenger, mq);
-
-  return msg_client;
-}
-
-static void
-callback_client_disconnect (void *cls, struct GNUNET_SERVICE_Client *client, void *internal_cls)
-{
-  struct GNUNET_MESSENGER_Client *msg_client = internal_cls;
-
-  remove_service_handle (messenger, msg_client->handle);
-
-  GNUNET_free(msg_client);
-}
-
-/**
- * Setup MESSENGER internals.
- *
- * @param[in/out] cls closure
- * @param[in] config configuration to use
- * @param[in/out] service the initialized service
- */
-static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, struct GNUNET_SERVICE_Handle *service)
-{
-  messenger = create_service (config, service);
-
-  if (!messenger)
-    GNUNET_SCHEDULER_shutdown ();
-}
-
-/**
- * Define "main" method using service macro.
- */
-GNUNET_SERVICE_MAIN(
-    GNUNET_MESSENGER_SERVICE_NAME,
-    GNUNET_SERVICE_OPTION_NONE,
-    &run,
-    &callback_client_connect,
-    &callback_client_disconnect,
-    NULL,
-    GNUNET_MQ_hd_var_size( create, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_CREATE, struct GNUNET_MESSENGER_CreateMessage, NULL ),
-    GNUNET_MQ_hd_fixed_size( update, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_UPDATE, struct GNUNET_MESSENGER_UpdateMessage, NULL ),
-    GNUNET_MQ_hd_fixed_size( destroy, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_DESTROY, struct GNUNET_MESSENGER_DestroyMessage, NULL ),
-    GNUNET_MQ_hd_var_size( set_name, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_SET_NAME, struct GNUNET_MESSENGER_NameMessage, NULL ),
-    GNUNET_MQ_hd_fixed_size( room_open, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN, struct GNUNET_MESSENGER_RoomMessage, NULL ),
-    GNUNET_MQ_hd_fixed_size( room_entry, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY, struct GNUNET_MESSENGER_RoomMessage, NULL ),
-    GNUNET_MQ_hd_fixed_size( room_close, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE, struct GNUNET_MESSENGER_RoomMessage, NULL ),
-    GNUNET_MQ_hd_var_size( send_message, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_SEND_MESSAGE, struct GNUNET_MESSENGER_SendMessage, NULL ),
-    GNUNET_MQ_hd_fixed_size( get_message, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_GET_MESSAGE, struct GNUNET_MESSENGER_GetMessage, NULL ),
-    GNUNET_MQ_handler_end());
diff --git a/src/messenger/gnunet-service-messenger.h b/src/messenger/gnunet-service-messenger.h
deleted file mode 100644
index 253fbaadb..000000000
--- a/src/messenger/gnunet-service-messenger.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_H
-#define GNUNET_SERVICE_MESSENGER_H
-
-#include "platform.h"
-#include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_protocols.h"
-#include "gnunet_util_lib.h"
-
-/**
- * Message to create a handle for a client
- */
-struct GNUNET_MESSENGER_CreateMessage
-{
-  struct GNUNET_MessageHeader header;
-};
-
-/**
- * Message to update the handle (its EGO key) for a client
- */
-struct GNUNET_MESSENGER_UpdateMessage
-{
-  struct GNUNET_MessageHeader header;
-};
-
-/**
- * Message to destroy the handle for a client
- */
-struct GNUNET_MESSENGER_DestroyMessage
-{
-  struct GNUNET_MessageHeader header;
-};
-
-/**
- * Message to receive the current name of a handle
- */
-struct GNUNET_MESSENGER_NameMessage
-{
-  struct GNUNET_MessageHeader header;
-};
-
-/**
- * Message to receive the current public key of a handle
- */
-struct GNUNET_MESSENGER_KeyMessage
-{
-  struct GNUNET_MessageHeader header;
-};
-
-/**
- * General message to confirm interaction with a room
- */
-struct GNUNET_MESSENGER_RoomMessage
-{
-  struct GNUNET_MessageHeader header;
-
-  struct GNUNET_PeerIdentity door;
-  struct GNUNET_HashCode key;
-};
-
-/**
- * Message to receive the current member id of a handle in room
- */
-struct GNUNET_MESSENGER_MemberMessage
-{
-  struct GNUNET_MessageHeader header;
-
-  struct GNUNET_HashCode key;
-  struct GNUNET_ShortHashCode id;
-};
-
-/**
- * Message to send something into a room
- */
-struct GNUNET_MESSENGER_SendMessage
-{
-  struct GNUNET_MessageHeader header;
-
-  struct GNUNET_HashCode key;
-  uint32_t flags;
-};
-
-/**
- * Message to request something from a room
- */
-struct GNUNET_MESSENGER_GetMessage
-{
-  struct GNUNET_MessageHeader header;
-
-  struct GNUNET_HashCode key;
-  struct GNUNET_HashCode hash;
-};
-
-/**
- * Message to receive something from a room
- */
-struct GNUNET_MESSENGER_RecvMessage
-{
-  struct GNUNET_MessageHeader header;
-
-  struct GNUNET_HashCode key;
-  struct GNUNET_HashCode sender;
-  struct GNUNET_HashCode context;
-  struct GNUNET_HashCode hash;
-  uint32_t flags;
-};
-
-#endif //GNUNET_SERVICE_MESSENGER_H
diff --git a/src/messenger/gnunet-service-messenger_basement.c b/src/messenger/gnunet-service-messenger_basement.c
deleted file mode 100644
index f302c8d66..000000000
--- a/src/messenger/gnunet-service-messenger_basement.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_basement.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_basement.h"
-
-size_t
-count_of_tunnels (const struct GNUNET_MESSENGER_ListTunnels *tunnels)
-{
-  GNUNET_assert(tunnels);
-
-  const struct GNUNET_MESSENGER_ListTunnel *element;
-  size_t count = 0;
-
-  for (element = tunnels->head; element; element = element->next)
-    count++;
-
-  return count;
-}
-
-int
-should_connect_tunnel_to (size_t count, size_t src, size_t dst)
-{
-  if ((src + 1) % count == dst % count)
-    return GNUNET_YES;
-
-  return GNUNET_NO;
-}
-
-int
-required_connection_between (size_t count, size_t src, size_t dst)
-{
-  if (GNUNET_YES == should_connect_tunnel_to (count, src, dst))
-    return GNUNET_YES;
-  if (GNUNET_YES == should_connect_tunnel_to (count, dst, src))
-    return GNUNET_YES;
-
-  return GNUNET_NO;
-}
diff --git a/src/messenger/gnunet-service-messenger_basement.h b/src/messenger/gnunet-service-messenger_basement.h
deleted file mode 100644
index b19aec405..000000000
--- a/src/messenger/gnunet-service-messenger_basement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_basement.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_BASEMENT_H
-#define GNUNET_SERVICE_MESSENGER_BASEMENT_H
-
-#include "messenger_api_list_tunnels.h"
-
-/**
- * Returns the count of peers in a list (typically from the basement of a room).
- *
- * @param[in] tunnels List of peer identities
- * @return Count of the entries in the list
- */
-size_t
-count_of_tunnels (const struct GNUNET_MESSENGER_ListTunnels *tunnels);
-
-/**
- * Returns #GNUNET_YES or #GNUNET_NO to determine if the peer at index <i>src</i> should
- * or should not connect outgoing to the peer at index <i>dst</i> to construct a complete
- * basement with a given <i>count</i> of peers.
- *
- * @param[in] count Count of peers
- * @param[in] src Source index
- * @param[in] dst Destination index
- * @return #GNUNET_YES or #GNUNET_NO based on topologic requirement
- */
-int
-should_connect_tunnel_to (size_t count, size_t src, size_t dst);
-
-/**
- * Returns #GNUNET_YES or #GNUNET_NO to determine if the peers of index <i>src</i> and
- * index <i>dst</i> should be connected in any direction to construct a complete
- * basement with a given <i>count</i> of peers.
- *
- * @param[in] count Count of peers
- * @param[in] src Source index
- * @param[in] dst Destination index
- * @return #GNUNET_YES or #GNUNET_NO based on topologic requirement
- */
-int
-required_connection_between (size_t count, size_t src, size_t dst);
-
-#endif //GNUNET_SERVICE_MESSENGER_BASEMENT_H
diff --git a/src/messenger/gnunet-service-messenger_ego_store.c b/src/messenger/gnunet-service-messenger_ego_store.c
deleted file mode 100644
index 3b069fcf5..000000000
--- a/src/messenger/gnunet-service-messenger_ego_store.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_ego_store.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_ego_store.h"
-
-#include "gnunet-service-messenger_handle.h"
-
-static void
-callback_update_ego (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx, const char *identifier)
-{
-  if ((!ego) || (!identifier))
-    return;
-
-  struct GNUNET_MESSENGER_EgoStore *store = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "New ego in use: '%s'\n", identifier);
-
-  update_store_ego (store, identifier, GNUNET_IDENTITY_ego_get_private_key (ego));
-}
-
-void
-init_ego_store(struct GNUNET_MESSENGER_EgoStore *store, const struct GNUNET_CONFIGURATION_Handle *config)
-{
-  GNUNET_assert ((store) && (config));
-
-  store->cfg = config;
-  store->identity = GNUNET_IDENTITY_connect (config, &callback_update_ego, store);
-  store->egos = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-
-  store->lu_start = NULL;
-  store->lu_end = NULL;
-
-  store->op_start = NULL;
-  store->op_end = NULL;
-}
-
-
-static int
-iterate_destroy_egos (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Ego *ego = value;
-  GNUNET_free(ego);
-  return GNUNET_YES;
-}
-
-void
-clear_ego_store(struct GNUNET_MESSENGER_EgoStore *store)
-{
-  GNUNET_assert (store);
-
-  struct GNUNET_MESSENGER_EgoOperation *op;
-
-  while (store->op_start)
-  {
-    op = store->op_start;
-
-    GNUNET_IDENTITY_cancel (op->operation);
-    GNUNET_CONTAINER_DLL_remove (store->op_start, store->op_end, op);
-
-    if (op->identifier)
-      GNUNET_free (op->identifier);
-
-    GNUNET_free (op);
-  }
-
-  struct GNUNET_MESSENGER_EgoLookup *lu;
-
-  while (store->lu_start)
-  {
-    lu = store->lu_start;
-
-    GNUNET_IDENTITY_ego_lookup_cancel(lu->lookup);
-    GNUNET_CONTAINER_DLL_remove (store->lu_start, store->lu_end, lu);
-
-    if (lu->identifier)
-      GNUNET_free(lu->identifier);
-
-    GNUNET_free (lu);
-  }
-
-  GNUNET_CONTAINER_multihashmap_iterate (store->egos, iterate_destroy_egos, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (store->egos);
-
-  if (store->identity)
-  {
-    GNUNET_IDENTITY_disconnect (store->identity);
-
-    store->identity = NULL;
-  }
-}
-
-static void
-callback_ego_create (void *cls, const struct GNUNET_IDENTITY_PrivateKey *key, const char *emsg)
-{
-  struct GNUNET_MESSENGER_EgoOperation *element = cls;
-  struct GNUNET_MESSENGER_EgoStore *store = element->store;
-
-  GNUNET_assert(element->identifier);
-
-  if (emsg)
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s\n", emsg);
-
-  if (key)
-  {
-    struct GNUNET_MESSENGER_SrvHandle *handle = element->handle;
-
-    struct GNUNET_MESSENGER_Ego *msg_ego = update_store_ego (store, element->identifier, key);
-
-    set_handle_ego (handle, msg_ego);
-  }
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Creating ego failed!\n");
-
-  GNUNET_CONTAINER_DLL_remove (store->op_start, store->op_end, element);
-  GNUNET_free (element->identifier);
-  GNUNET_free (element);
-}
-
-void
-create_store_ego (struct GNUNET_MESSENGER_EgoStore *store, const char *identifier,
-                  void *handle)
-{
-  GNUNET_assert ((store) && (identifier));
-
-  struct GNUNET_MESSENGER_EgoOperation *element = GNUNET_new (struct GNUNET_MESSENGER_EgoOperation);
-
-  element->store = store;
-  element->handle = handle;
-
-  element->identifier = GNUNET_strdup (identifier);
-
-  element->operation = GNUNET_IDENTITY_create (store->identity, identifier, NULL,
-                                               GNUNET_IDENTITY_TYPE_ECDSA, callback_ego_create, element);
-
-  GNUNET_CONTAINER_DLL_insert (store->op_start, store->op_end, element);
-}
-
-static void
-callback_ego_lookup (void *cls, struct GNUNET_IDENTITY_Ego *ego)
-{
-  struct GNUNET_MESSENGER_EgoLookup *element = cls;
-  struct GNUNET_MESSENGER_EgoStore *store = element->store;
-
-  GNUNET_assert(element->identifier);
-
-  struct GNUNET_MESSENGER_Ego *msg_ego;
-
-  if (ego)
-    msg_ego = update_store_ego (
-        store, element->identifier, GNUNET_IDENTITY_ego_get_private_key(ego)
-    );
-  else
-    msg_ego = NULL;
-
-  if (element->cb)
-    element->cb(element->cls, element->identifier, msg_ego);
-
-  GNUNET_CONTAINER_DLL_remove (store->lu_start, store->lu_end, element);
-  GNUNET_free (element->identifier);
-  GNUNET_free (element);
-}
-
-void
-lookup_store_ego(struct GNUNET_MESSENGER_EgoStore *store, const char *identifier,
-                 GNUNET_MESSENGER_EgoLookupCallback lookup, void *cls)
-{
-  GNUNET_assert (store);
-
-  if (!identifier)
-  {
-    lookup(cls, identifier, NULL);
-    return;
-  }
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (identifier, strlen (identifier), &hash);
-
-  struct GNUNET_MESSENGER_Ego *ego = GNUNET_CONTAINER_multihashmap_get (store->egos, &hash);
-
-  if (ego)
-    lookup(cls, identifier, ego);
-  else
-  {
-    struct GNUNET_MESSENGER_EgoLookup *element = GNUNET_new (struct GNUNET_MESSENGER_EgoLookup);
-
-    element->store = store;
-
-    element->cb = lookup;
-    element->cls = cls;
-
-    element->identifier = GNUNET_strdup (identifier);
-
-    element->lookup = GNUNET_IDENTITY_ego_lookup(store->cfg, identifier, callback_ego_lookup, element);
-
-    GNUNET_CONTAINER_DLL_insert (store->lu_start, store->lu_end, element);
-  }
-}
-
-struct GNUNET_MESSENGER_Ego*
-update_store_ego(struct GNUNET_MESSENGER_EgoStore *store, const char *identifier,
-                 const struct GNUNET_IDENTITY_PrivateKey *key)
-{
-  GNUNET_assert ((store) && (identifier) && (key));
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (identifier, strlen (identifier), &hash);
-
-  struct GNUNET_MESSENGER_Ego *ego = GNUNET_CONTAINER_multihashmap_get (store->egos, &hash);
-
-  if (!ego)
-  {
-    ego = GNUNET_new(struct GNUNET_MESSENGER_Ego);
-    GNUNET_CONTAINER_multihashmap_put (store->egos, &hash, ego, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-  }
-
-  GNUNET_memcpy(&(ego->priv), key, sizeof(*key));
-
-  if (GNUNET_OK != GNUNET_IDENTITY_key_get_public (key, &(ego->pub)))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Updating invalid ego key failed!\n");
-
-  return ego;
-}
-
-static void
-callback_ego_rename (void *cls, const char *emsg)
-{
-  struct GNUNET_MESSENGER_EgoOperation *element = cls;
-  struct GNUNET_MESSENGER_EgoStore *store = element->store;
-
-  GNUNET_assert(element->identifier);
-
-  if (emsg)
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%s\n", emsg);
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (element->identifier, strlen (element->identifier), &hash);
-
-  struct GNUNET_MESSENGER_Ego *ego = GNUNET_CONTAINER_multihashmap_get (store->egos, &hash);
-
-  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (store->egos, &hash, ego))
-  {
-    GNUNET_CRYPTO_hash ((char*) element->handle, strlen ((char*) element->handle), &hash);
-
-    GNUNET_CONTAINER_multihashmap_put (store->egos, &hash, ego,
-                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-  }
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Renaming ego failed!\n");
-
-  GNUNET_free (element->handle);
-
-  GNUNET_CONTAINER_DLL_remove (store->op_start, store->op_end, element);
-  GNUNET_free (element->identifier);
-  GNUNET_free (element);
-}
-
-void
-rename_store_ego (struct GNUNET_MESSENGER_EgoStore *store, const char *old_identifier,
-                  const char *new_identifier)
-{
-  GNUNET_assert ((store) && (old_identifier) && (new_identifier));
-
-  struct GNUNET_MESSENGER_EgoOperation *element = GNUNET_new (struct GNUNET_MESSENGER_EgoOperation);
-
-  element->store = store;
-  element->handle = GNUNET_strdup (new_identifier);
-
-  element->identifier = GNUNET_strdup (old_identifier);
-
-  element->operation = GNUNET_IDENTITY_rename (store->identity, old_identifier, new_identifier, callback_ego_rename, element);
-
-  GNUNET_CONTAINER_DLL_insert (store->op_start, store->op_end, element);
-}
diff --git a/src/messenger/gnunet-service-messenger_ego_store.h b/src/messenger/gnunet-service-messenger_ego_store.h
deleted file mode 100644
index 41f14fff2..000000000
--- a/src/messenger/gnunet-service-messenger_ego_store.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_ego_store.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_EGO_STORE_H
-#define GNUNET_SERVICE_MESSENGER_EGO_STORE_H
-
-#include "platform.h"
-#include "gnunet_container_lib.h"
-
-#include "messenger_api_ego.h"
-
-struct GNUNET_MESSENGER_Ego;
-struct GNUNET_MESSENGER_EgoStore;
-
-typedef void
-(*GNUNET_MESSENGER_EgoLookupCallback) (void *cls, const char *identifier,
-                                       const struct GNUNET_MESSENGER_Ego *ego);
-
-struct GNUNET_MESSENGER_EgoLookup
-{
-  struct GNUNET_MESSENGER_EgoLookup *prev;
-  struct GNUNET_MESSENGER_EgoLookup *next;
-
-  struct GNUNET_IDENTITY_EgoLookup *lookup;
-
-  struct GNUNET_MESSENGER_EgoStore *store;
-
-  GNUNET_MESSENGER_EgoLookupCallback cb;
-  void *cls;
-
-  char *identifier;
-};
-
-struct GNUNET_MESSENGER_EgoOperation
-{
-  struct GNUNET_MESSENGER_EgoOperation *prev;
-  struct GNUNET_MESSENGER_EgoOperation *next;
-
-  struct GNUNET_IDENTITY_Operation *operation;
-
-  struct GNUNET_MESSENGER_EgoStore *store;
-  void *handle;
-
-  char *identifier;
-};
-
-struct GNUNET_MESSENGER_EgoStore
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  struct GNUNET_IDENTITY_Handle *identity;
-  struct GNUNET_CONTAINER_MultiHashMap *egos;
-
-  struct GNUNET_MESSENGER_EgoLookup *lu_start;
-  struct GNUNET_MESSENGER_EgoLookup *lu_end;
-
-  struct GNUNET_MESSENGER_EgoOperation *op_start;
-  struct GNUNET_MESSENGER_EgoOperation *op_end;
-};
-
-/**
- * Initializes an EGO-store as fully empty.
- *
- * @param[out] store EGO-store
- * @param[in] config Configuration handle
- */
-void
-init_ego_store (struct GNUNET_MESSENGER_EgoStore *store, const struct GNUNET_CONFIGURATION_Handle *config);
-
-/**
- * Clears an EGO-store, wipes its content and deallocates its memory.
- *
- * @param[in/out] store EGO-store
- */
-void
-clear_ego_store (struct GNUNET_MESSENGER_EgoStore *store);
-
-/**
- * Creates a new EGO which will be registered to a <i>store</i> under
- * a specific <i>identifier</i>. A given <i>handle</i> will be informed
- * about the creation and changes its EGO accordingly.
- *
- * @param[in/out] store EGO-store
- * @param[in] identifier Identifier string
- * @param[in/out] handle Handle or NULL
- */
-void
-create_store_ego (struct GNUNET_MESSENGER_EgoStore *store, const char *identifier,
-                  void *handle);
-
-/**
- * Lookups an EGO which was registered to a <i>store</i> under
- * a specific <i>identifier</i>.
- *
- * @param[in/out] store EGO-store
- * @param[in] identifier Identifier string
- * @param[in] lookup Lookup callback (non-NULL)
- * @param[in] cls Closure
- */
-void
-lookup_store_ego (struct GNUNET_MESSENGER_EgoStore *store, const char *identifier,
-                  GNUNET_MESSENGER_EgoLookupCallback lookup, void *cls);
-
-/**
- * Updates the registration of an EGO to a <i>store</i> under
- * a specific <i>identifier</i> with a new <i>key</i>.
- *
- * @param[in/out] store EGO-store
- * @param[in] identifier Identifier string
- * @param[in] key Private EGO key
- * @return Updated EGO
- */
-struct GNUNET_MESSENGER_Ego*
-update_store_ego (struct GNUNET_MESSENGER_EgoStore *store, const char *identifier,
-                  const struct GNUNET_IDENTITY_PrivateKey *key);
-
-/**
- * Updates the location of a registered EGO in a <i>store</i> to
- * a different one under a specific <i>new_identifier<i> replacing
- * its old one.
- *
- * @param[in/out] store EGO-store
- * @param[in] old_identifier Old identifier string
- * @param[in] new_identifier New identifier string
- */
-void
-rename_store_ego (struct GNUNET_MESSENGER_EgoStore *store, const char *old_identifier,
-                  const char *new_identifier);
-
-#endif //GNUNET_SERVICE_MESSENGER_EGO_STORE_H
diff --git a/src/messenger/gnunet-service-messenger_handle.c b/src/messenger/gnunet-service-messenger_handle.c
deleted file mode 100644
index d7007dbf6..000000000
--- a/src/messenger/gnunet-service-messenger_handle.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_handle.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_handle.h"
-
-#include "gnunet-service-messenger.h"
-#include "gnunet-service-messenger_message_kind.h"
-
-#include "messenger_api_util.h"
-
-struct GNUNET_MESSENGER_SrvHandle*
-create_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MQ_Handle *mq)
-{
-  GNUNET_assert((service) && (mq));
-
-  struct GNUNET_MESSENGER_SrvHandle *handle = GNUNET_new(struct GNUNET_MESSENGER_SrvHandle);
-
-  handle->service = service;
-  handle->mq = mq;
-
-  handle->name = NULL;
-  handle->ego = NULL;
-
-  handle->member_ids = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-
-  return handle;
-}
-
-int
-iterate_free_member_ids (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  GNUNET_free(value);
-
-  return GNUNET_YES;
-}
-
-void
-destroy_handle (struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert(handle);
-
-  if (handle->service->dir)
-    save_handle_configuration (handle);
-
-  if (handle->name)
-    GNUNET_free(handle->name);
-
-  GNUNET_CONTAINER_multihashmap_iterate (handle->member_ids, iterate_free_member_ids, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (handle->member_ids);
-
-  GNUNET_free(handle);
-}
-
-void
-get_handle_data_subdir (const struct GNUNET_MESSENGER_SrvHandle *handle, const char *name, char **dir)
-{
-  GNUNET_assert((handle) && (dir));
-
-  if (name)
-    GNUNET_asprintf (dir, "%s%s%c%s%c", handle->service->dir, "identities",
-                     DIR_SEPARATOR, name, DIR_SEPARATOR);
-  else
-    GNUNET_asprintf (dir, "%s%s%c", handle->service->dir, "anonymous",
-                     DIR_SEPARATOR);
-}
-
-static int
-create_handle_member_id (const struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  struct GNUNET_ShortHashCode *random_id = GNUNET_new(struct GNUNET_ShortHashCode);
-
-  if (!random_id)
-    return GNUNET_NO;
-
-  generate_free_member_id (random_id, NULL);
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (handle->member_ids, key, random_id,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-  {
-    GNUNET_free(random_id);
-    return GNUNET_NO;
-  }
-
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Created a new member id (%s) for room: %s\n", GNUNET_sh2s (random_id),
-             GNUNET_h2s (key));
-
-  return GNUNET_YES;
-}
-
-const struct GNUNET_ShortHashCode*
-get_handle_member_id (const struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  return GNUNET_CONTAINER_multihashmap_get (handle->member_ids, key);
-}
-
-int
-change_handle_member_id (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key,
-                         const struct GNUNET_ShortHashCode *unique_id)
-{
-  GNUNET_assert((handle) && (key) && (unique_id));
-
-  struct GNUNET_ShortHashCode *member_id = GNUNET_CONTAINER_multihashmap_get (handle->member_ids, key);
-
-  if (!member_id)
-  {
-    member_id = GNUNET_new(struct GNUNET_ShortHashCode);
-    GNUNET_memcpy(member_id, unique_id, sizeof(*member_id));
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (handle->member_ids, key, member_id,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    {
-      GNUNET_free(member_id);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  if (0 == GNUNET_memcmp(unique_id, member_id))
-    goto send_message_to_client;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Change a member id (%s) for room (%s).\n", GNUNET_sh2s (member_id),
-             GNUNET_h2s (key));
-
-  GNUNET_memcpy(member_id, unique_id, sizeof(*unique_id));
-
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member id changed to (%s).\n", GNUNET_sh2s (unique_id));
-
-  struct GNUNET_MESSENGER_MemberMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-send_message_to_client:
-
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_MEMBER_ID);
-
-  GNUNET_memcpy(&(msg->key), key, sizeof(*key));
-  GNUNET_memcpy(&(msg->id), member_id, sizeof(*member_id));
-
-  GNUNET_MQ_send (handle->mq, env);
-  return GNUNET_OK;
-}
-
-static void
-change_handle_name (struct GNUNET_MESSENGER_SrvHandle *handle, const char *name)
-{
-  GNUNET_assert(handle);
-
-  if (handle->name)
-    GNUNET_free(handle->name);
-
-  handle->name = name ? GNUNET_strdup(name) : NULL;
-
-  const uint16_t name_len = handle->name ? strlen (handle->name) : 0;
-
-  struct GNUNET_MESSENGER_NameMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg_extra(msg, name_len + 1, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_GET_NAME);
-
-  char *extra = ((char*) msg) + sizeof(*msg);
-
-  if (name_len)
-    GNUNET_memcpy(extra, handle->name, name_len);
-
-  extra[name_len] = '\0';
-
-  GNUNET_MQ_send (handle->mq, env);
-}
-
-static void
-change_handle_ego (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_MESSENGER_Ego *ego)
-{
-  GNUNET_assert(handle);
-
-  handle->ego = ego;
-
-  ego = get_handle_ego (handle);
-
-  const uint16_t length = GNUNET_IDENTITY_key_get_length(&(ego->pub));
-
-  struct GNUNET_MESSENGER_KeyMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg_extra(msg, length, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_GET_KEY);
-
-  char *extra = ((char*) msg) + sizeof(*msg);
-
-  if (GNUNET_IDENTITY_write_key_to_buffer(&(ego->pub), extra, length) < 0)
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Could not write key to buffer.\n");
-
-  GNUNET_MQ_send (handle->mq, env);
-}
-
-struct GNUNET_MESSENGER_MessageHandle
-{
-  struct GNUNET_MESSENGER_SrvHandle *handle;
-  struct GNUNET_MESSENGER_Message *message;
-};
-
-static int
-iterate_send_message (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MessageHandle *msg_handle = cls;
-
-  send_handle_message (msg_handle->handle, key, msg_handle->message);
-
-  return GNUNET_YES;
-}
-
-void
-set_handle_ego (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_MESSENGER_Ego *ego)
-{
-  GNUNET_assert((handle) && (ego));
-
-  struct GNUNET_MESSENGER_MessageHandle msg_handle;
-
-  msg_handle.handle = handle;
-  msg_handle.message = create_message_key (&(ego->priv));
-
-  GNUNET_CONTAINER_multihashmap_iterate (handle->member_ids, iterate_send_message, &msg_handle);
-
-  destroy_message (msg_handle.message);
-
-  change_handle_ego (handle, ego);
-}
-
-const struct GNUNET_MESSENGER_Ego*
-get_handle_ego (const struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert(handle);
-
-  static struct GNUNET_MESSENGER_Ego anonymous;
-  static int read_keys = 0;
-
-  if (handle->ego)
-    return handle->ego;
-
-  if (!read_keys)
-  {
-    struct GNUNET_IDENTITY_Ego *ego = GNUNET_IDENTITY_ego_get_anonymous ();
-    GNUNET_memcpy(&(anonymous.priv), GNUNET_IDENTITY_ego_get_private_key (ego), sizeof(anonymous.priv));
-    GNUNET_IDENTITY_ego_get_public_key (ego, &(anonymous.pub));
-    read_keys = 1;
-  }
-
-  return &anonymous;
-}
-
-static void
-callback_setup_handle_name (void *cls, const char *name, const struct GNUNET_MESSENGER_Ego *ego)
-{
-  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Setting up handle...\n");
-
-  change_handle_name (handle, name);
-  change_handle_ego (handle, ego);
-
-  if (handle->service->dir)
-    load_handle_configuration (handle);
-}
-
-void
-setup_handle_name (struct GNUNET_MESSENGER_SrvHandle *handle, const char *name)
-{
-  GNUNET_assert(handle);
-
-  struct GNUNET_MESSENGER_EgoStore *store = get_service_ego_store(handle->service);
-
-  lookup_store_ego (store, name, callback_setup_handle_name, handle);
-}
-
-static void
-callback_update_handle (void *cls, const char *name, const struct GNUNET_MESSENGER_Ego *ego)
-{
-  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Updating handle...\n");
-
-  struct GNUNET_MESSENGER_EgoStore *store = get_service_ego_store(handle->service);
-
-  if (!ego)
-    create_store_ego(store, handle->name, handle);
-  else
-    change_handle_ego (handle, ego);
-}
-
-void
-update_handle (struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert(handle);
-
-  if (!handle->name)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Updating handle failed: Name is required!\n");
-    return;
-  }
-
-  struct GNUNET_MESSENGER_EgoStore *store = get_service_ego_store(handle->service);
-
-  lookup_store_ego (store, handle->name, callback_update_handle, handle);
-}
-
-static void
-callback_set_handle_name (void *cls, const char *name, const struct GNUNET_MESSENGER_Ego *ego)
-{
-  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Renaming handle...\n");
-
-  if (ego)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Renaming handle failed: Name is occupied! (%s)\n", name);
-    return;
-  }
-
-  struct GNUNET_MESSENGER_EgoStore *store = get_service_ego_store(handle->service);
-
-  int rename_ego_in_store = handle->ego? GNUNET_YES : GNUNET_NO;
-
-  char *old_dir;
-  get_handle_data_subdir (handle, handle->name, &old_dir);
-
-  char *new_dir;
-  get_handle_data_subdir (handle, name, &new_dir);
-
-  int result = 0;
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (old_dir, GNUNET_YES))
-  {
-    GNUNET_DISK_directory_create_for_file (new_dir);
-
-    result = rename (old_dir, new_dir);
-  }
-  else if (GNUNET_YES == GNUNET_DISK_directory_test (new_dir, GNUNET_NO))
-    result = -1;
-
-  if (0 == result)
-  {
-    struct GNUNET_MESSENGER_MessageHandle msg_handle;
-
-    msg_handle.handle = handle;
-    msg_handle.message = create_message_name (name);
-
-    GNUNET_CONTAINER_multihashmap_iterate (handle->member_ids, iterate_send_message, &msg_handle);
-
-    destroy_message (msg_handle.message);
-
-    change_handle_name (handle, name);
-  }
-  else
-    rename_ego_in_store = GNUNET_NO;
-
-  GNUNET_free(old_dir);
-  GNUNET_free(new_dir);
-
-  if (GNUNET_YES == rename_ego_in_store)
-    rename_store_ego(store, handle->name, name);
-}
-
-void
-set_handle_name (struct GNUNET_MESSENGER_SrvHandle *handle, const char *name)
-{
-  GNUNET_assert(handle);
-
-  if (!name)
-  {
-    if (handle->ego)
-      GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Renaming handle failed: Name is required!\n");
-    else
-      change_handle_name (handle, name);
-
-    return;
-  }
-
-  struct GNUNET_MESSENGER_EgoStore *store = get_service_ego_store(handle->service);
-
-  lookup_store_ego (store, name, callback_set_handle_name, handle);
-}
-
-int
-open_handle_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  if ((!get_handle_member_id (handle, key)) && (GNUNET_YES != create_handle_member_id (handle, key)))
-    return GNUNET_NO;
-
-  return open_service_room (handle->service, handle, key);
-}
-
-int
-entry_handle_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_PeerIdentity *door,
-                   const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (door) && (key));
-
-  if ((!get_handle_member_id (handle, key)) && (GNUNET_YES != create_handle_member_id (handle, key)))
-    return GNUNET_NO;
-
-  return entry_service_room (handle->service, handle, door, key);
-}
-
-int
-close_handle_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  if (!get_handle_member_id (handle, key))
-    return GNUNET_NO;
-
-  return close_service_room (handle->service, handle, key);
-}
-
-int
-send_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key,
-                     const struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert((handle) && (key) && (message));
-
-  const struct GNUNET_ShortHashCode *id = get_handle_member_id (handle, key);
-
-  if (!id)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "It is required to be a member of a room to send messages!\n");
-    return GNUNET_NO;
-  }
-
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (handle->service, key);
-
-  if (!room)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "The room (%s) is unknown!\n", GNUNET_h2s (key));
-    return GNUNET_NO;
-  }
-
-  struct GNUNET_MESSENGER_Message *msg = copy_message(message);
-
-  GNUNET_memcpy(&(msg->header.sender_id), id, sizeof(*id));
-
-  return send_room_message (room, handle, msg);
-}
-
-static const struct GNUNET_HashCode*
-get_next_member_session_contect(const struct GNUNET_MESSENGER_MemberSession *session)
-{
-  if (session->next)
-    return get_next_member_session_contect (session->next);
-  else
-    return get_member_session_context(session);
-}
-
-static const struct GNUNET_MESSENGER_MemberSession*
-get_handle_member_session (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key) && (handle->service));
-
-  const struct GNUNET_ShortHashCode *id = get_handle_member_id(handle, key);
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room(handle->service, key);
-
-  if ((!id) || (!room))
-    return NULL;
-
-  struct GNUNET_MESSENGER_MemberStore *store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member(store, id);
-
-  const struct GNUNET_MESSENGER_Ego *ego = get_handle_ego(handle);
-
-  if (!ego)
-    return NULL;
-
-  return get_member_session(member, &(ego->pub));
-}
-
-void
-notify_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key,
-                       const struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((handle) && (key) && (session) && (message) && (hash));
-
-  if ((!handle->mq) || (!get_handle_member_id (handle, key)))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Notifying client about message requires membership!\n");
-    return;
-  }
-
-  const struct GNUNET_IDENTITY_PublicKey *pubkey = get_contact_key(session->contact);
-
-  struct GNUNET_HashCode sender;
-  GNUNET_CRYPTO_hash(pubkey, sizeof(*pubkey), &sender);
-
-  const struct GNUNET_HashCode *context = get_next_member_session_contect (session);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying client about message: %s\n", GNUNET_h2s (hash));
-
-  struct GNUNET_MESSENGER_Message *private_message = NULL;
-
-  if (GNUNET_MESSENGER_KIND_PRIVATE == message->header.kind)
-  {
-    private_message = copy_message(message);
-
-    if (GNUNET_YES != decrypt_message(private_message, &(get_handle_ego(handle)->priv)))
-    {
-      destroy_message(private_message);
-      private_message = NULL;
-    }
-    else
-      message = private_message;
-  }
-
-  struct GNUNET_MESSENGER_RecvMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  uint16_t length = get_message_size (message, GNUNET_YES);
-
-  env = GNUNET_MQ_msg_extra(msg, length, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_RECV_MESSAGE);
-
-  GNUNET_memcpy(&(msg->key), key, sizeof(msg->key));
-  GNUNET_memcpy(&(msg->sender), &sender, sizeof(msg->sender));
-  GNUNET_memcpy(&(msg->context), context, sizeof(msg->context));
-  GNUNET_memcpy(&(msg->hash), hash, sizeof(msg->hash));
-
-  msg->flags = (uint32_t) GNUNET_MESSENGER_FLAG_NONE;
-
-  if (get_handle_member_session(handle, key) == session)
-    msg->flags |= (uint32_t) GNUNET_MESSENGER_FLAG_SENT;
-
-  if (private_message)
-    msg->flags |= (uint32_t) GNUNET_MESSENGER_FLAG_PRIVATE;
-
-  char *buffer = ((char*) msg) + sizeof(*msg);
-  encode_message (message, length, buffer, GNUNET_YES);
-
-  if (private_message)
-    destroy_message(private_message);
-
-  GNUNET_MQ_send (handle->mq, env);
-}
-
-static int
-callback_scan_for_rooms (void *cls, const char *filename)
-{
-  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  if ((GNUNET_YES == GNUNET_DISK_file_test (filename)) && (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename)))
-  {
-    struct GNUNET_HashCode key;
-    struct GNUNET_ShortHashCode member_id;
-
-    if ((GNUNET_OK == GNUNET_CONFIGURATION_get_data (cfg, "room", "key", &key, sizeof(key))) &&
-        (GNUNET_OK == GNUNET_CONFIGURATION_get_data (cfg, "room", "member_id", &member_id, sizeof(member_id))))
-      change_handle_member_id (handle, &key, &member_id);
-  }
-
-  GNUNET_CONFIGURATION_destroy (cfg);
-  return GNUNET_OK;
-}
-
-void
-load_handle_configuration (struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert(handle);
-
-  char *id_dir;
-  get_handle_data_subdir (handle, handle->name, &id_dir);
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (id_dir, GNUNET_YES))
-  {
-    char *scan_dir;
-    GNUNET_asprintf (&scan_dir, "%s%s%c", id_dir, "rooms", DIR_SEPARATOR);
-
-    if (GNUNET_OK == GNUNET_DISK_directory_test (scan_dir, GNUNET_YES))
-      GNUNET_DISK_directory_scan (scan_dir, callback_scan_for_rooms, handle);
-
-    GNUNET_free(scan_dir);
-  }
-
-  GNUNET_free(id_dir);
-}
-
-static int
-iterate_save_rooms (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-  struct GNUNET_ShortHashCode *member_id = value;
-
-  char *id_dir;
-  get_handle_data_subdir (handle, handle->name, &id_dir);
-
-  char *filename;
-  GNUNET_asprintf (&filename, "%s%s%c%s.cfg", id_dir, "rooms", DIR_SEPARATOR, GNUNET_h2s (key));
-
-  GNUNET_free(id_dir);
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  char *key_data = GNUNET_STRINGS_data_to_string_alloc (key, sizeof(*key));
-
-  if (key_data)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg, "room", "key", key_data);
-
-    GNUNET_free(key_data);
-  }
-
-  char *member_id_data = GNUNET_STRINGS_data_to_string_alloc (member_id, sizeof(*member_id));
-
-  if (member_id_data)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg, "room", "member_id", member_id_data);
-
-    GNUNET_free(member_id_data);
-  }
-
-  GNUNET_CONFIGURATION_write (cfg, filename);
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-  GNUNET_free(filename);
-
-  return GNUNET_YES;
-}
-
-void
-save_handle_configuration (struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert(handle);
-
-  char *id_dir;
-  get_handle_data_subdir (handle, handle->name, &id_dir);
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (id_dir, GNUNET_NO)) || (GNUNET_OK
-      == GNUNET_DISK_directory_create (id_dir)))
-  {
-    char *save_dir;
-    GNUNET_asprintf (&save_dir, "%s%s%c", id_dir, "rooms", DIR_SEPARATOR);
-
-    if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
-        (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
-      GNUNET_CONTAINER_multihashmap_iterate (handle->member_ids, iterate_save_rooms, handle);
-
-    GNUNET_free(save_dir);
-  }
-
-  GNUNET_free(id_dir);
-}
diff --git a/src/messenger/gnunet-service-messenger_handle.h b/src/messenger/gnunet-service-messenger_handle.h
deleted file mode 100644
index d8ff3aaa8..000000000
--- a/src/messenger/gnunet-service-messenger_handle.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_handle.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_HANDLE_H
-#define GNUNET_SERVICE_MESSENGER_HANDLE_H
-
-#include "platform.h"
-#include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_mq_lib.h"
-
-#include "gnunet-service-messenger_service.h"
-#include "gnunet-service-messenger_member_session.h"
-
-#include "messenger_api_ego.h"
-#include "messenger_api_message.h"
-
-struct GNUNET_MESSENGER_SrvHandle
-{
-  struct GNUNET_MESSENGER_Service *service;
-  struct GNUNET_MQ_Handle *mq;
-
-  char *name;
-
-  const struct GNUNET_MESSENGER_Ego *ego;
-
-  struct GNUNET_CONTAINER_MultiHashMap *member_ids;
-};
-
-/**
- * Creates and allocates a new handle related to a <i>service</i> and using a given <i>mq</i> (message queue).
- *
- * @param[in/out] service MESSENGER Service
- * @param[in/out] mq Message queue
- * @return New handle
- */
-struct GNUNET_MESSENGER_SrvHandle*
-create_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MQ_Handle *mq);
-
-/**
- * Destroys a handle and frees its memory fully.
- *
- * @param[in/out] handle Handle
- */
-void
-destroy_handle (struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Writes the path of the directory for a given <i>handle</i> using a specific <i>name</i> to the parameter
- * <i>dir</i>. This directory will be used to store data regarding the handle and its messages.
- *
- * @param[in] handle Handle
- * @param[in] name Potential name of the handle
- * @param[out] dir Path to store data
- */
-void
-get_handle_data_subdir (const struct GNUNET_MESSENGER_SrvHandle *handle, const char *name, char **dir);
-
-/**
- * Returns the member id of a given <i>handle</i> in a specific <i>room</i>.
- *
- * If the handle is not a member of the specific <i>room</i>, NULL gets returned.
- *
- * @param[in] handle Handle
- * @param[in] key Key of a room
- * @return Member id or NULL
- */
-const struct GNUNET_ShortHashCode*
-get_handle_member_id (const struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Changes the member id of a given <i>handle</i> in a specific <i>room</i> to match a <i>unique_id</i>
- * and returns GNUNET_OK on success.
- *
- * The client connected to the <i>handle</i> will be informed afterwards automatically.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of a room
- * @param[in] unique_id Unique member id
- * @return GNUNET_OK on success, otherwise GNUNET_SYSERR
- */
-int
-change_handle_member_id (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key,
-                         const struct GNUNET_ShortHashCode *unique_id);
-
-/**
- * Sets the EGO used by a given <i>handle</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] ego EGO key pair
- */
-void
-set_handle_ego (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_MESSENGER_Ego *ego);
-
-/**
- * Returns the EGO used by a given <i>handle</i>.
- *
- * @param[in] handle Handle
- * @return EGO key pair
- */
-const struct GNUNET_MESSENGER_Ego*
-get_handle_ego (const struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Tries to set the name and EGO key of a <i>handle</i> initially by looking up a specific <i>name</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] name Name (optionally: valid EGO name)
- */
-void
-setup_handle_name (struct GNUNET_MESSENGER_SrvHandle *handle, const char *name);
-
-/**
- * Tries to change the key pair of an EGO of a <i>handle</i> under the same name and informs all rooms
- * about the change automatically.
- *
- * @param[in/out] handle Handle
- */
-void
-update_handle (struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Tries to rename the handle which implies renaming the EGO its using and moving all related data into
- * the directory fitting to the changed <i>name</i>.
- *
- * The client connected to the <i>handle</i> will be informed afterwards automatically.
- *
- * @param[in/out] handle Handle
- * @param[in] name New name
- */
-void
-set_handle_name (struct GNUNET_MESSENGER_SrvHandle *handle, const char *name);
-
-/**
- * Makes a given <i>handle</i> a member of the room using a specific <i>key</i> and opens the
- * room from the handles service.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of a room
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-open_handle_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Makes a given <i>handle</i> a member of the room using a specific <i>key</i> and enters the room
- * through a tunnel to a peer identified by a given <i>door</i> (peer identity).
- *
- * @param[in/out] handle Handle
- * @param[in] door Peer identity
- * @param[in] key Key of a room
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-entry_handle_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_PeerIdentity *door,
-                   const struct GNUNET_HashCode *key);
-
-/**
- * Removes the membership of the room using a specific <i>key</i> and closes it if no other handle
- * from this service is still a member of it.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of a room
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-close_handle_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Sends a <i>message</i> from a given <i>handle</i> to the room using a specific <i>key</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of a room
- * @param[in] message Message
- * @return #GNUNET_YES on success, #GNUNET_NO or #GNUNET_SYSERR otherwise.
- */
-int
-send_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key,
-                     const struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Notifies the handle that a new message was received or sent.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- * @param[in] session Member session
- * @param[in] message Message
- * @param[in] hash Hash of message
- */
-void
-notify_handle_message (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key,
-                       const struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Loads member ids and other potential configuration from a given <i>handle</i> which
- * depends on the given name the <i>handle</i> uses.
- *
- * @param[out] handle Handle
- */
-void
-load_handle_configuration (struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Saves member ids and other potential configuration from a given <i>handle</i> which
- * depends on the given name the <i>handle</i> uses.
- *
- * @param[in] handle Handle
- */
-void
-save_handle_configuration (struct GNUNET_MESSENGER_SrvHandle *handle);
-
-#endif //GNUNET_SERVICE_MESSENGER_HANDLE_H
diff --git a/src/messenger/gnunet-service-messenger_list_handles.c b/src/messenger/gnunet-service-messenger_list_handles.c
deleted file mode 100644
index adcbf6a42..000000000
--- a/src/messenger/gnunet-service-messenger_list_handles.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_list_handles.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_list_handles.h"
-
-#include "gnunet-service-messenger_handle.h"
-
-void
-init_list_handles (struct GNUNET_MESSENGER_ListHandles *handles)
-{
-  GNUNET_assert(handles);
-
-  handles->head = NULL;
-  handles->tail = NULL;
-}
-
-void
-clear_list_handles (struct GNUNET_MESSENGER_ListHandles *handles)
-{
-  GNUNET_assert(handles);
-
-  while (handles->head)
-  {
-    struct GNUNET_MESSENGER_ListHandle *element = handles->head;
-
-    GNUNET_CONTAINER_DLL_remove(handles->head, handles->tail, element);
-    destroy_handle (element->handle);
-    GNUNET_free(element);
-  }
-
-  handles->head = NULL;
-  handles->tail = NULL;
-}
-
-void
-add_list_handle (struct GNUNET_MESSENGER_ListHandles *handles, struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert((handles) && (handle));
-
-  struct GNUNET_MESSENGER_ListHandle *element = GNUNET_new(struct GNUNET_MESSENGER_ListHandle);
-
-  element->handle = handle;
-
-  GNUNET_CONTAINER_DLL_insert_tail(handles->head, handles->tail, element);
-}
-
-int
-remove_list_handle (struct GNUNET_MESSENGER_ListHandles *handles, struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert((handles) && (handle));
-
-  struct GNUNET_MESSENGER_ListHandle *element;
-
-  for (element = handles->head; element; element = element->next)
-    if (element->handle == handle)
-      break;
-
-  if (!element)
-    return GNUNET_NO;
-
-  GNUNET_CONTAINER_DLL_remove(handles->head, handles->tail, element);
-  GNUNET_free(element);
-
-  return GNUNET_YES;
-}
-
-struct GNUNET_MESSENGER_SrvHandle*
-find_list_handle_by_member (const struct GNUNET_MESSENGER_ListHandles *handles, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handles) && (key));
-
-  struct GNUNET_MESSENGER_ListHandle *element;
-
-  for (element = handles->head; element; element = element->next)
-    if (get_handle_member_id ((struct GNUNET_MESSENGER_SrvHandle*) element->handle, key))
-      return element->handle;
-
-  return NULL;
-}
diff --git a/src/messenger/gnunet-service-messenger_list_handles.h b/src/messenger/gnunet-service-messenger_list_handles.h
deleted file mode 100644
index 9f7ca725f..000000000
--- a/src/messenger/gnunet-service-messenger_list_handles.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_list_handles.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
-#define GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-
-struct GNUNET_MESSENGER_SrvHandle;
-
-struct GNUNET_MESSENGER_ListHandle
-{
-  struct GNUNET_MESSENGER_ListHandle *prev;
-  struct GNUNET_MESSENGER_ListHandle *next;
-
-  struct GNUNET_MESSENGER_SrvHandle *handle;
-};
-
-struct GNUNET_MESSENGER_ListHandles
-{
-  struct GNUNET_MESSENGER_ListHandle *head;
-  struct GNUNET_MESSENGER_ListHandle *tail;
-};
-
-/**
- * Initializes list of <i>handles</i> as empty list.
- *
- * @param[out] handles List of handles
- */
-void
-init_list_handles (struct GNUNET_MESSENGER_ListHandles *handles);
-
-/**
- * Destroys remaining <i>handles</i> and clears the list.
- *
- * @param[in/out] handles List of handles
- */
-void
-clear_list_handles (struct GNUNET_MESSENGER_ListHandles *handles);
-
-/**
- * Adds a specific <i>handle</i> to the end of the list.
- *
- * @param[in/out] handles List of handles
- * @param[in/out] handle Handle
- */
-void
-add_list_handle (struct GNUNET_MESSENGER_ListHandles *handles, struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Removes the first entry matching with a specific <i>handle</i> from the list of
- * <i>handles</i> and returns #GNUNET_YES on success or #GNUNET_NO on failure.
- *
- * @param[in/out] handles List of handles
- * @param[in/out] handle Handle
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-remove_list_handle (struct GNUNET_MESSENGER_ListHandles *handles, struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Searches linearly through the list of <i>handles</i> for members of a specific room
- * which is identified by a given <i>key</i>.
- *
- * If no handle is found which is a current member, NULL gets returned.
- *
- * @param[in] handles List of handles
- * @param[in] key Common key of a room
- * @return First handle which is a current member
- */
-struct GNUNET_MESSENGER_SrvHandle*
-find_list_handle_by_member (const struct GNUNET_MESSENGER_ListHandles *handles, const struct GNUNET_HashCode *key);
-
-#endif //GNUNET_SERVICE_MESSENGER_LIST_HANDLES_H
diff --git a/src/messenger/gnunet-service-messenger_list_messages.c b/src/messenger/gnunet-service-messenger_list_messages.c
deleted file mode 100644
index 2666ccdab..000000000
--- a/src/messenger/gnunet-service-messenger_list_messages.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_list_messages.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_list_messages.h"
-
-void
-init_list_messages (struct GNUNET_MESSENGER_ListMessages *messages)
-{
-  GNUNET_assert(messages);
-
-  messages->head = NULL;
-  messages->tail = NULL;
-}
-
-void
-clear_list_messages (struct GNUNET_MESSENGER_ListMessages *messages)
-{
-  GNUNET_assert(messages);
-
-  while (messages->head)
-  {
-    struct GNUNET_MESSENGER_ListMessage *element = messages->head;
-
-    GNUNET_CONTAINER_DLL_remove(messages->head, messages->tail, element);
-    GNUNET_free(element);
-  }
-
-  messages->head = NULL;
-  messages->tail = NULL;
-}
-
-void
-add_to_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((messages) && (hash));
-
-  struct GNUNET_MESSENGER_ListMessage *element = GNUNET_new(struct GNUNET_MESSENGER_ListMessage);
-
-  GNUNET_memcpy(&(element->hash), hash, sizeof(struct GNUNET_HashCode));
-
-  GNUNET_CONTAINER_DLL_insert_tail(messages->head, messages->tail, element);
-}
-
-void
-copy_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const struct GNUNET_MESSENGER_ListMessages *origin)
-{
-  GNUNET_assert((messages) && (origin));
-
-  struct GNUNET_MESSENGER_ListMessage *element;
-
-  for (element = origin->head; element; element = element->next)
-    add_to_list_messages (messages, &(element->hash));
-}
-
-void
-remove_from_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((messages) && (hash));
-
-  struct GNUNET_MESSENGER_ListMessage *element;
-
-  for (element = messages->head; element; element = element->next)
-    if (0 == GNUNET_CRYPTO_hash_cmp (&(element->hash), hash))
-    {
-      GNUNET_CONTAINER_DLL_remove(messages->head, messages->tail, element);
-      GNUNET_free(element);
-      break;
-    }
-}
-
-void
-load_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const char *path)
-{
-  GNUNET_assert((messages) && (path));
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (path))
-    return;
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open(
-      path, GNUNET_DISK_OPEN_READ, permission
-  );
-
-  if (!handle)
-    return;
-
-  GNUNET_DISK_file_seek(handle, 0, GNUNET_DISK_SEEK_SET);
-
-  struct GNUNET_HashCode hash;
-  ssize_t len;
-
-  do {
-    len = GNUNET_DISK_file_read(handle, &hash, sizeof(hash));
-
-    if (len != sizeof(hash))
-      break;
-
-    add_to_list_messages(messages, &hash);
-  } while (len == sizeof(hash));
-
-  GNUNET_DISK_file_close(handle);
-}
-
-void
-save_list_messages (const struct GNUNET_MESSENGER_ListMessages *messages, const char *path)
-{
-  GNUNET_assert((messages) && (path));
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open(
-      path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
-  );
-
-  if (!handle)
-    return;
-
-  GNUNET_DISK_file_seek(handle, 0, GNUNET_DISK_SEEK_SET);
-
-  struct GNUNET_MESSENGER_ListMessage *element;
-
-  for (element = messages->head; element; element = element->next)
-    GNUNET_DISK_file_write(handle, &(element->hash), sizeof(element->hash));
-
-  GNUNET_DISK_file_sync(handle);
-  GNUNET_DISK_file_close(handle);
-}
diff --git a/src/messenger/gnunet-service-messenger_list_messages.h b/src/messenger/gnunet-service-messenger_list_messages.h
deleted file mode 100644
index 93ec203ea..000000000
--- a/src/messenger/gnunet-service-messenger_list_messages.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_list_messages.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
-#define GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
-
-struct GNUNET_MESSENGER_ListMessage
-{
-  struct GNUNET_MESSENGER_ListMessage *prev;
-  struct GNUNET_MESSENGER_ListMessage *next;
-
-  struct GNUNET_HashCode hash;
-};
-
-struct GNUNET_MESSENGER_ListMessages
-{
-  struct GNUNET_MESSENGER_ListMessage *head;
-  struct GNUNET_MESSENGER_ListMessage *tail;
-};
-
-/**
- * Initializes list of message hashes as empty list.
- *
- * @param[out] messages List of hashes
- */
-void
-init_list_messages (struct GNUNET_MESSENGER_ListMessages *messages);
-
-/**
- * Clears the list of message hashes.
- *
- * @param[in/out] messages List of hashes
- */
-void
-clear_list_messages (struct GNUNET_MESSENGER_ListMessages *messages);
-
-/**
- * Adds a specific <i>hash</i> from a message to the end of the list.
- *
- * @param[in/out] messages List of hashes
- * @param[in] hash Hash of message
- */
-void
-add_to_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const struct GNUNET_HashCode *hash);
-
-/**
- * Copies all message hashes from an <i>origin</i> to another list.
- *
- * @param[in/out] messages Destination list of hashes
- * @param[in] origin Source list of hashes
- */
-void
-copy_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const struct GNUNET_MESSENGER_ListMessages *origin);
-
-/**
- * Removes the first entry with a matching <i>hash</i> from the list.
- *
- * @param[in/out] messages List of hashes
- * @param[in] hash Hash of message
- */
-void
-remove_from_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const struct GNUNET_HashCode *hash);
-
-/**
- * Loads the list of message hashes from a file under a given <i>path</i>.
- *
- * @param[out] messages List of hashes
- * @param[in] path Path of file
- */
-void
-load_list_messages (struct GNUNET_MESSENGER_ListMessages *messages, const char *path);
-
-/**
- * Saves the list of message hashes to a file under a given <i>path</i>.
- *
- * @param[in] messages List of hashes
- * @param[in] path Path of file
- */
-void
-save_list_messages (const struct GNUNET_MESSENGER_ListMessages *messages, const char *path);
-
-#endif //GNUNET_SERVICE_MESSENGER_LIST_MESSAGES_H
diff --git a/src/messenger/gnunet-service-messenger_member.c b/src/messenger/gnunet-service-messenger_member.c
deleted file mode 100644
index b0a735dbe..000000000
--- a/src/messenger/gnunet-service-messenger_member.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_member.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_member.h"
-
-#include "gnunet-service-messenger_member_session.h"
-
-struct GNUNET_MESSENGER_Member*
-create_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id)
-{
-  GNUNET_assert (store);
-
-  struct GNUNET_MESSENGER_Member *member = GNUNET_new(struct GNUNET_MESSENGER_Member);
-
-  member->store = store;
-
-  if (id)
-    GNUNET_memcpy(&(member->id), id, sizeof(member->id));
-  else if (GNUNET_YES != generate_free_member_id(&(member->id), store->members))
-  {
-    GNUNET_free (member);
-    return NULL;
-  }
-
-  member->sessions = GNUNET_CONTAINER_multihashmap_create(2, GNUNET_NO);
-
-  return member;
-}
-
-static int
-iterate_destroy_session (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MemberSession *session = value;
-  destroy_member_session(session);
-  return GNUNET_YES;
-}
-
-void
-destroy_member (struct GNUNET_MESSENGER_Member *member)
-{
-  GNUNET_assert((member) && (member->sessions));
-
-  GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_destroy_session, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (member->sessions);
-
-  GNUNET_free (member);
-}
-
-const struct GNUNET_ShortHashCode*
-get_member_id (const struct GNUNET_MESSENGER_Member *member)
-{
-  GNUNET_assert (member);
-
-  return &(member->id);
-}
-
-static int
-callback_scan_for_sessions (void *cls, const char *filename)
-{
-  struct GNUNET_MESSENGER_Member *member = cls;
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (filename, GNUNET_YES))
-  {
-    char *directory;
-
-    GNUNET_asprintf (&directory, "%s%c", filename, DIR_SEPARATOR);
-
-    load_member_session(member, directory);
-    GNUNET_free (directory);
-  }
-
-  return GNUNET_OK;
-}
-
-void
-load_member (struct GNUNET_MESSENGER_MemberStore *store, const char *directory)
-{
-  GNUNET_assert ((store) && (directory));
-
-  char *config_file;
-  GNUNET_asprintf (&config_file, "%s%s", directory, "member.cfg");
-
-  struct GNUNET_MESSENGER_Member *member = NULL;
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (config_file))
-    goto free_config;
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  if (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, config_file))
-  {
-    struct GNUNET_ShortHashCode id;
-
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_data (cfg, "member", "id", &id, sizeof(id)))
-      goto destroy_config;
-
-    member = add_store_member(store, &id);
-  }
-
-destroy_config:
-
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-free_config:
-  GNUNET_free(config_file);
-
-  if (!member)
-    return;
-
-  char *scan_dir;
-  GNUNET_asprintf (&scan_dir, "%s%s%c", directory, "sessions", DIR_SEPARATOR);
-
-  if (GNUNET_OK == GNUNET_DISK_directory_test (scan_dir, GNUNET_YES))
-    GNUNET_DISK_directory_scan (scan_dir, callback_scan_for_sessions, member);
-
-  GNUNET_free(scan_dir);
-}
-
-static int
-iterate_load_next_session (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  const char* sessions_directory = cls;
-
-  char* load_dir;
-  GNUNET_asprintf (&load_dir, "%s%s%c", sessions_directory, GNUNET_h2s(key), DIR_SEPARATOR);
-
-  struct GNUNET_MESSENGER_MemberSession *session = value;
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (load_dir, GNUNET_YES))
-    load_member_session_next (session, load_dir);
-
-  GNUNET_free (load_dir);
-  return GNUNET_YES;
-}
-
-void
-load_member_next_sessions (const struct GNUNET_MESSENGER_Member *member, const char *directory)
-{
-  GNUNET_assert ((member) && (directory));
-
-  char* load_dir;
-  GNUNET_asprintf (&load_dir, "%s%s%c", directory, "sessions", DIR_SEPARATOR);
-
-  GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_load_next_session, load_dir);
-
-  GNUNET_free(load_dir);
-}
-
-static int
-iterate_save_session (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  const char* sessions_directory = cls;
-
-  char* save_dir;
-  GNUNET_asprintf (&save_dir, "%s%s%c", sessions_directory, GNUNET_h2s(key), DIR_SEPARATOR);
-
-  struct GNUNET_MESSENGER_MemberSession *session = value;
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
-      (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
-    save_member_session (session, save_dir);
-
-  GNUNET_free (save_dir);
-  return GNUNET_YES;
-}
-
-void
-save_member (struct GNUNET_MESSENGER_Member *member, const char *directory)
-{
-  GNUNET_assert ((member) && (directory));
-
-  char *config_file;
-  GNUNET_asprintf (&config_file, "%s%s", directory, "member.cfg");
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  char *id_data = GNUNET_STRINGS_data_to_string_alloc (&(member->id), sizeof(member->id));
-
-  if (id_data)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg, "member", "id", id_data);
-
-    GNUNET_free(id_data);
-  }
-
-  GNUNET_CONFIGURATION_write (cfg, config_file);
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-  GNUNET_free(config_file);
-
-  char* save_dir;
-  GNUNET_asprintf (&save_dir, "%s%s%c", directory, "sessions", DIR_SEPARATOR);
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
-      (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
-    GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_save_session, save_dir);
-
-  GNUNET_free(save_dir);
-}
-
-static void
-sync_session_contact_from_next (struct GNUNET_MESSENGER_MemberSession *session, struct GNUNET_MESSENGER_MemberSession *next)
-{
-  GNUNET_assert((session) && (next));
-
-  if (session == next)
-    return;
-
-  if (next->next)
-    sync_session_contact_from_next (session, next->next);
-  else
-    session->contact = next->contact;
-}
-
-static int
-iterate_sync_session_contact (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MemberSession *session = value;
-
-  if (session->next)
-    sync_session_contact_from_next (session, session->next);
-
-  return GNUNET_YES;
-}
-
-void
-sync_member_contacts (struct GNUNET_MESSENGER_Member *member)
-{
-  GNUNET_assert ((member) && (member->sessions));
-
-  GNUNET_CONTAINER_multihashmap_iterate (member->sessions, iterate_sync_session_contact, NULL);
-}
-
-struct GNUNET_MESSENGER_MemberSession*
-get_member_session (const struct GNUNET_MESSENGER_Member *member, const struct GNUNET_IDENTITY_PublicKey *public_key)
-{
-  GNUNET_assert ((member) && (public_key));
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
-
-  return GNUNET_CONTAINER_multihashmap_get(member->sessions, &hash);
-}
-
-struct GNUNET_MESSENGER_ClosureSearchSession {
-  const struct GNUNET_MESSENGER_Message *message;
-  const struct GNUNET_HashCode *hash;
-
-  struct GNUNET_MESSENGER_MemberSession *match;
-};
-
-static int
-iterate_search_session (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_ClosureSearchSession* search = cls;
-  struct GNUNET_MESSENGER_MemberSession *session = value;
-
-  if (GNUNET_OK != verify_member_session_as_sender(session, search->message, search->hash))
-    return GNUNET_YES;
-
-  search->match = session;
-  return GNUNET_NO;
-}
-
-static struct GNUNET_MESSENGER_MemberSession*
-try_member_session (struct GNUNET_MESSENGER_Member *member, const struct GNUNET_IDENTITY_PublicKey *public_key)
-{
-  struct GNUNET_MESSENGER_MemberSession* session = get_member_session(member, public_key);
-
-  if (session)
-    return session;
-
-  session = create_member_session(member, public_key);
-
-  if (session)
-    add_member_session(member, session);
-
-  return session;
-}
-
-struct GNUNET_MESSENGER_MemberSession*
-get_member_session_of (struct GNUNET_MESSENGER_Member *member, const struct GNUNET_MESSENGER_Message *message,
-                       const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert ((member) && (message) && (hash) &&
-                 (0 == GNUNET_memcmp(&(member->id), &(message->header.sender_id))));
-
-  if (GNUNET_MESSENGER_KIND_INFO == message->header.kind)
-    return try_member_session(member, &(message->body.info.host_key));
-  else if (GNUNET_MESSENGER_KIND_JOIN == message->header.kind)
-    return try_member_session(member, &(message->body.join.key));
-
-  struct GNUNET_MESSENGER_ClosureSearchSession search;
-
-  search.message = message;
-  search.hash = hash;
-
-  search.match = NULL;
-  GNUNET_CONTAINER_multihashmap_iterate(member->sessions, iterate_search_session, &search);
-
-  return search.match;
-}
-
-void
-add_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSENGER_MemberSession *session)
-{
-  if (!session)
-    return;
-
-  GNUNET_assert((member) && (session->member == member));
-
-  const struct GNUNET_IDENTITY_PublicKey *public_key = get_member_session_public_key(session);
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(
-      member->sessions, &hash, session,
-      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Adding a member session failed: %s\n",
-               GNUNET_h2s(&hash));
-}
-
-void
-remove_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSENGER_MemberSession *session)
-{
-  GNUNET_assert ((member) && (session) && (session->member == member));
-
-  const struct GNUNET_IDENTITY_PublicKey *public_key = get_member_session_public_key(session);
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
-
-  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove(member->sessions, &hash, session))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Removing a member session failed: %s\n",
-               GNUNET_h2s(&hash));
-}
-
-struct GNUNET_MESSENGER_ClosureIterateSessions {
-  GNUNET_MESSENGER_MemberIteratorCallback it;
-  void *cls;
-};
-
-static int
-iterate_member_sessions_it (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_ClosureIterateSessions *iterate = cls;
-  struct GNUNET_MESSENGER_MemberSession *session = value;
-
-  return iterate->it (iterate->cls, get_member_session_public_key(session), session);
-}
-
-int
-iterate_member_sessions (struct GNUNET_MESSENGER_Member *member, GNUNET_MESSENGER_MemberIteratorCallback it, void *cls)
-{
-  GNUNET_assert ((member) && (member->sessions) && (it));
-
-  struct GNUNET_MESSENGER_ClosureIterateSessions iterate;
-
-  iterate.it = it;
-  iterate.cls = cls;
-
-  return GNUNET_CONTAINER_multihashmap_iterate(member->sessions, iterate_member_sessions_it, &iterate);
-}
diff --git a/src/messenger/gnunet-service-messenger_member.h b/src/messenger/gnunet-service-messenger_member.h
deleted file mode 100644
index fb2e57cfb..000000000
--- a/src/messenger/gnunet-service-messenger_member.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_member.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MEMBER_H
-#define GNUNET_SERVICE_MESSENGER_MEMBER_H
-
-#include "messenger_api_contact.h"
-
-#include "gnunet-service-messenger_list_messages.h"
-#include "gnunet-service-messenger_member_store.h"
-#include "messenger_api_message.h"
-#include "messenger_api_util.h"
-
-struct GNUNET_MESSENGER_Member
-{
-  struct GNUNET_MESSENGER_MemberStore *store;
-  struct GNUNET_ShortHashCode id;
-
-  struct GNUNET_CONTAINER_MultiHashMap *sessions;
-};
-
-/**
- * Creates and allocates a new member of a <i>room</i> with an optionally defined or
- * random <i>id</i>.
- *
- * If the creation fails, NULL gets returned.
- *
- * @param[in/out] store Member store
- * @param[in] id Member id or NULL
- * @return New member or NULL
- */
-struct GNUNET_MESSENGER_Member*
-create_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id);
-
-/**
- * Destroys a member and frees its memory fully.
- *
- * @param[in/out] member Member
- */
-void
-destroy_member (struct GNUNET_MESSENGER_Member *member);
-
-/**
- * Returns the current id of a given <i>member</i>.
- *
- * @param[in] member Member
- * @return Member id
- */
-const struct GNUNET_ShortHashCode*
-get_member_id (const struct GNUNET_MESSENGER_Member *member);
-
-/**
- * Loads data from a <i>directory</i> into a new allocated and created member
- * of a <i>store</i> if the required information can be read from the content
- * of the given directory.
- *
- * @param[out] store Member store
- * @param[in] directory Path to a directory
- */
-void
-load_member (struct GNUNET_MESSENGER_MemberStore *store, const char *directory);
-
-/**
- * Loads data about next sessions from a <i>directory</i> into an empty loaded
- * <i>member</i> which does not contain a fully built session graph yet.
- *
- * @param[in/out] member Member
- * @param[in] directory Path to a directory
- */
-void
-load_member_next_sessions (const struct GNUNET_MESSENGER_Member *member, const char *directory);
-
-/**
- * Saves data from a <i>member</i> into a directory which
- * can be load to restore the member completely.
- *
- * @param[in] member Member
- * @param[in] directory Path to a directory
- */
-void
-save_member (struct GNUNET_MESSENGER_Member *member, const char *directory);
-
-/**
- * Synchronizes contacts between all sessions from a given <i>member</i>
- * and other sessions which are linked to them.
- *
- * @param[in/out] member Member
- */
-void
-sync_member_contacts (struct GNUNET_MESSENGER_Member *member);
-
-/**
- * Returns the member session of a <i>member</i> identified by a given public key.
- * If the member does not provide a session with the given key, NULL gets returned.
- *
- * @param[in] member Member
- * @param[in] public_key Public key of EGO
- * @return Member session
- */
-struct GNUNET_MESSENGER_MemberSession*
-get_member_session (const struct GNUNET_MESSENGER_Member *member, const struct GNUNET_IDENTITY_PublicKey *public_key);
-
-/**
- * Returns the member session of a <i>member</i> using a public key which can verify
- * the signature of a given <i>message</i> and its <i>hash</i>. If the member does
- * not provide a matching session, NULL gets returned.
- *
- * @param[in] member Member
- * @param[in] message Message
- * @param[in] hash Hash of message
- * @return Member session
- */
-struct GNUNET_MESSENGER_MemberSession*
-get_member_session_of (struct GNUNET_MESSENGER_Member *member, const struct GNUNET_MESSENGER_Message *message,
-                       const struct GNUNET_HashCode *hash);
-
-/**
- * Adds a given member <i>session</i> to its <i>member</i>.
- *
- * @param[in/out] member Member
- * @param[in/out] session Member session
- */
-void
-add_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSENGER_MemberSession *session);
-
-/**
- * Removes a given member <i>session</i> from its <i>member</i>.
- *
- * @param[in/out] member Member
- * @param[in/out] session Member session
- */
-void
-remove_member_session (struct GNUNET_MESSENGER_Member *member, struct GNUNET_MESSENGER_MemberSession *session);
-
-/**
- * Iterate through all member sessions currently connected to a given <i>member</i>
- * and call the provided iterator callback with a selected closure. The function
- * will return the amount of member sessions it iterated through.
- *
- * @param[in/out] member Member
- * @param[in] it Iterator callback
- * @param[in/out] cls Closure
- * @return Amount of sessions iterated through
- */
-int
-iterate_member_sessions (struct GNUNET_MESSENGER_Member *member, GNUNET_MESSENGER_MemberIteratorCallback it, void* cls);
-
-#endif //GNUNET_SERVICE_MESSENGER_MEMBER_H
diff --git a/src/messenger/gnunet-service-messenger_member_session.c b/src/messenger/gnunet-service-messenger_member_session.c
deleted file mode 100644
index 690c703b2..000000000
--- a/src/messenger/gnunet-service-messenger_member_session.c
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_member_session.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_member_session.h"
-
-#include "gnunet-service-messenger_room.h"
-#include "gnunet-service-messenger_message_store.h"
-
-#include "messenger_api_contact_store.h"
-
-struct GNUNET_MESSENGER_MemberSession*
-create_member_session (struct GNUNET_MESSENGER_Member *member,
-                       const struct GNUNET_IDENTITY_PublicKey *pubkey)
-{
-  if ((!member) || (!pubkey) || (!(member->store)))
-    return NULL;
-
-  struct GNUNET_MESSENGER_MemberSession *session = GNUNET_new(struct GNUNET_MESSENGER_MemberSession);
-  session->member = member;
-
-  GNUNET_memcpy(&(session->public_key), pubkey, sizeof(session->public_key));
-
-  get_context_from_member (
-      get_member_session_key (session),
-      get_member_session_id (session),
-      &(session->context)
-  );
-
-  struct GNUNET_MESSENGER_ContactStore *store = get_member_contact_store(session->member->store);
-
-  session->contact = get_store_contact(
-      store,
-      get_member_session_context (session),
-      get_member_session_public_key (session)
-  );
-
-  if (!(session->contact))
-  {
-    GNUNET_free(session);
-    return NULL;
-  }
-
-  increase_contact_rc (session->contact);
-
-  session->history = GNUNET_CONTAINER_multihashmap_create(8, GNUNET_NO);
-
-  init_list_messages(&(session->messages));
-
-  session->prev = NULL;
-  session->next = NULL;
-
-  session->start = GNUNET_TIME_absolute_get();
-
-  session->closed = GNUNET_NO;
-  session->completed = GNUNET_NO;
-
-  return session;
-}
-
-static void
-check_member_session_completion (struct GNUNET_MESSENGER_MemberSession *session)
-{
-  GNUNET_assert (session);
-
-  if (!session->messages.tail)
-  {
-    session->completed = GNUNET_YES;
-    goto completion;
-  }
-
-  const struct GNUNET_HashCode* start = &(session->messages.head->hash);
-  const struct GNUNET_HashCode* end = &(session->messages.tail->hash);
-
-  struct GNUNET_MESSENGER_ListMessages level;
-  init_list_messages(&level);
-
-  add_to_list_messages(&level, end);
-
-  struct GNUNET_MESSENGER_MessageStore *store = get_room_message_store(session->member->store->room);
-
-  struct GNUNET_MESSENGER_ListMessages list;
-  init_list_messages(&list);
-
-  while (level.head)
-  {
-    struct GNUNET_MESSENGER_ListMessage *element;
-
-    for (element = level.head; element; element = element->next)
-    {
-      const struct GNUNET_MESSENGER_MessageLink *link = get_store_message_link(
-          store, &(element->hash), GNUNET_NO
-      );
-
-      if (!link)
-        continue;
-
-      add_to_list_messages(&list, &(link->first));
-
-      if (GNUNET_YES == link->multiple)
-        add_to_list_messages(&list, &(link->second));
-    }
-
-    clear_list_messages(&level);
-
-    for (element = list.head; element; element = element->next)
-      if (GNUNET_YES == check_member_session_history(session, &(element->hash), GNUNET_YES))
-        break;
-
-    if (element)
-      if (0 != GNUNET_CRYPTO_hash_cmp(&(element->hash), start))
-        add_to_list_messages(&level, &(element->hash));
-      else
-        session->completed = GNUNET_YES;
-    else
-      copy_list_messages(&level, &list);
-
-    clear_list_messages(&list);
-  }
-
-completion:
-  if (GNUNET_YES == is_member_session_completed(session))
-  {
-    GNUNET_CONTAINER_multihashmap_destroy (session->history);
-
-    struct GNUNET_MESSENGER_ContactStore *store = get_member_contact_store(session->member->store);
-
-    if ((session->contact) && (GNUNET_YES == decrease_contact_rc (session->contact)))
-      remove_store_contact (
-          store,
-          session->contact,
-          get_member_session_context(session)
-      );
-
-    session->contact = NULL;
-  }
-}
-
-static int
-iterate_copy_history (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MemberSession *next = cls;
-
-  GNUNET_CONTAINER_multihashmap_put(next->history, key, (value? next : NULL),
-                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-
-  return GNUNET_YES;
-}
-
-struct GNUNET_MESSENGER_MemberSession*
-switch_member_session (struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message,
-                       const struct GNUNET_HashCode *hash)
-{
-  if ((!session) || (!message) || (!hash))
-    return NULL;
-
-  GNUNET_assert((GNUNET_MESSENGER_KIND_ID == message->header.kind) ||
-                (GNUNET_MESSENGER_KIND_KEY == message->header.kind));
-
-  struct GNUNET_MESSENGER_MemberSession *next = GNUNET_new(struct GNUNET_MESSENGER_MemberSession);
-
-  if (GNUNET_MESSENGER_KIND_ID == message->header.kind)
-    next->member = add_store_member(session->member->store, &(message->body.id.id));
-  else
-    next->member = session->member;
-
-  if (GNUNET_MESSENGER_KIND_KEY == message->header.kind)
-    GNUNET_memcpy(&(next->public_key), &(message->body.key.key), sizeof(next->public_key));
-  else
-    GNUNET_memcpy(&(next->public_key), get_member_session_public_key(session), sizeof(next->public_key));
-
-  get_context_from_member (
-      get_member_session_key (next),
-      get_member_session_id (next),
-      &(next->context)
-  );
-
-  update_store_contact(
-      get_member_contact_store(next->member->store),
-      get_member_session_contact(session),
-      get_member_session_context(session),
-      get_member_session_context(next),
-      get_member_session_public_key(next)
-  );
-
-  next->contact = get_member_session_contact(session);
-
-  if (!(next->contact))
-  {
-    GNUNET_free(next);
-    return NULL;
-  }
-
-  increase_contact_rc (next->contact);
-
-  next->history = GNUNET_CONTAINER_multihashmap_create(
-      GNUNET_CONTAINER_multihashmap_size(session->history), GNUNET_NO
-  );
-
-  GNUNET_CONTAINER_multihashmap_iterate(session->history, iterate_copy_history, next);
-
-  init_list_messages(&(next->messages));
-  copy_list_messages(&(next->messages), &(session->messages));
-
-  session->next = next;
-  next->prev = session;
-  next->next = NULL;
-
-  next->start = GNUNET_TIME_absolute_get();
-
-  session->closed = GNUNET_YES;
-  next->closed = GNUNET_NO;
-  next->completed = GNUNET_NO;
-
-  check_member_session_completion (session);
-
-  return next;
-}
-
-void
-destroy_member_session(struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert (session);
-
-  GNUNET_CONTAINER_multihashmap_destroy (session->history);
-
-  clear_list_messages (&(session->messages));
-
-  struct GNUNET_MESSENGER_Contact *contact = get_member_session_contact (session);
-
-  if ((contact) && (GNUNET_YES == decrease_contact_rc (contact)))
-    remove_store_contact (
-        get_member_contact_store(session->member->store),
-        contact,
-        get_member_session_context(session)
-    );
-
-  GNUNET_free(session);
-}
-
-int
-reset_member_session (struct GNUNET_MESSENGER_MemberSession* session,
-                      const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert ((session) && (hash));
-
-  struct GNUNET_MESSENGER_ContactStore *store = get_member_contact_store(session->member->store);
-  struct GNUNET_MESSENGER_Contact *contact = get_store_contact(
-      store,
-      get_member_session_context (session),
-      get_member_session_public_key (session)
-  );
-
-  if (!contact)
-    return GNUNET_SYSERR;
-
-  if (contact == session->contact)
-    goto clear_messages;
-
-  session->contact = contact;
-  increase_contact_rc (session->contact);
-
-clear_messages:
-  clear_list_messages(&(session->messages));
-  add_to_list_messages(&(session->messages), hash);
-
-  session->next = NULL;
-  session->closed = GNUNET_NO;
-  session->completed = GNUNET_NO;
-
-  return GNUNET_OK;
-}
-
-void
-close_member_session (struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert (session);
-
-  session->closed = GNUNET_YES;
-  check_member_session_completion (session);
-}
-
-int
-is_member_session_closed (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert(session);
-
-  return session->closed;
-}
-
-int
-is_member_session_completed (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert(session);
-
-  return session->completed;
-}
-
-struct GNUNET_TIME_Absolute
-get_member_session_start (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert(session);
-
-  if (session->prev)
-    return get_member_session_start(session->prev);
-
-  return session->start;
-}
-
-const struct GNUNET_HashCode*
-get_member_session_key (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert((session) && (session->member));
-
-  return get_member_store_key(session->member->store);
-}
-
-const struct GNUNET_ShortHashCode*
-get_member_session_id (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert(session);
-
-  return get_member_id(session->member);
-}
-
-const struct GNUNET_IDENTITY_PublicKey*
-get_member_session_public_key (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert(session);
-
-  return &(session->public_key);
-}
-
-const struct GNUNET_HashCode*
-get_member_session_context (const struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert(session);
-
-  return &(session->context);
-}
-
-struct GNUNET_MESSENGER_Contact*
-get_member_session_contact (struct GNUNET_MESSENGER_MemberSession* session)
-{
-  GNUNET_assert (session);
-
-  return session->contact;
-}
-
-int verify_member_session_as_sender (const struct GNUNET_MESSENGER_MemberSession *session,
-                                     const struct GNUNET_MESSENGER_Message *message,
-                                     const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((session) && (message) && (hash));
-
-  if (GNUNET_YES == is_member_session_completed(session))
-    return GNUNET_SYSERR;
-
-  if (0 != GNUNET_memcmp(get_member_session_id(session), &(message->header.sender_id)))
-    return GNUNET_SYSERR;
-
-  return verify_message(message, hash, get_member_session_public_key(session));
-}
-
-int
-check_member_session_history (const struct GNUNET_MESSENGER_MemberSession *session,
-                              const struct GNUNET_HashCode *hash, int ownership)
-{
-  GNUNET_assert((session) && (hash));
-
-  if (GNUNET_YES == ownership)
-    return (NULL != GNUNET_CONTAINER_multihashmap_get(session->history, hash)? GNUNET_YES : GNUNET_NO);
-  else
-    return GNUNET_CONTAINER_multihashmap_contains(session->history, hash);
-}
-
-static void
-update_member_chain_history (struct GNUNET_MESSENGER_MemberSession *session,
-                             const struct GNUNET_HashCode *hash, int ownership)
-{
-  GNUNET_assert ((session) && (hash));
-
-  if ((GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(session->history, hash, (GNUNET_YES == ownership? session : NULL),
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) && (session->next))
-    update_member_chain_history (session->next, hash, ownership);
-}
-
-void
-update_member_session_history (struct GNUNET_MESSENGER_MemberSession *session,
-                               const struct GNUNET_MESSENGER_Message *message,
-                               const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((session) && (message) && (hash));
-
-  if (GNUNET_YES == is_member_session_completed(session))
-    return;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Updating sessions history (%s) += (%s)\n",
-             GNUNET_sh2s(get_member_session_id(session)), GNUNET_h2s(hash));
-
-  if (GNUNET_OK == verify_member_session_as_sender (session, message, hash))
-  {
-    if (GNUNET_YES == is_message_session_bound (message))
-      add_to_list_messages(&(session->messages), hash);
-
-    update_member_chain_history (session, hash, GNUNET_YES);
-  }
-  else
-    update_member_chain_history (session, hash, GNUNET_NO);
-
-  if (GNUNET_YES == session->closed)
-    check_member_session_completion(session);
-}
-
-static void
-clear_member_chain_history (struct GNUNET_MESSENGER_MemberSession *session,
-                            const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert ((session) && (hash));
-
-  if ((0 < GNUNET_CONTAINER_multihashmap_remove_all(session->history, hash)) && (session->next))
-    clear_member_session_history(session->next, hash);
-}
-
-void
-clear_member_session_history (struct GNUNET_MESSENGER_MemberSession *session,
-                              const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((session) && (hash));
-
-  clear_member_chain_history (session, hash);
-}
-
-struct GNUNET_MESSENGER_MemberSessionHistoryEntry
-{
-  struct GNUNET_HashCode hash;
-  unsigned char ownership;
-};
-
-static void
-load_member_session_history (struct GNUNET_MESSENGER_MemberSession *session, const char *path)
-{
-  GNUNET_assert((session) && (path));
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (path))
-    return;
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open(
-      path, GNUNET_DISK_OPEN_READ, permission
-  );
-
-  if (!handle)
-    return;
-
-  GNUNET_DISK_file_seek(handle, 0, GNUNET_DISK_SEEK_SET);
-
-  struct GNUNET_MESSENGER_MemberSessionHistoryEntry entry;
-  ssize_t len;
-
-  int status;
-
-  do {
-    len = GNUNET_DISK_file_read(handle, &(entry.hash), sizeof(entry.hash));
-
-    if (len != sizeof(entry.hash))
-      break;
-
-    len = GNUNET_DISK_file_read(handle, &(entry.ownership), sizeof(entry.ownership));
-
-    if (len != sizeof(entry.ownership))
-      break;
-
-    status = GNUNET_CONTAINER_multihashmap_put(session->history, &(entry.hash), (entry.ownership? session : NULL),
-                                               GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-  } while (status == GNUNET_OK);
-
-  GNUNET_DISK_file_close(handle);
-}
-
-void
-load_member_session (struct GNUNET_MESSENGER_Member *member, const char *directory)
-{
-  GNUNET_assert ((member) && (directory));
-
-  char *config_file;
-  GNUNET_asprintf (&config_file, "%s%s", directory, "session.cfg");
-
-  struct GNUNET_MESSENGER_MemberSession *session = NULL;
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (config_file))
-    goto free_config;
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  if (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, config_file))
-  {
-    char *key_data;
-
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "session", "key", &key_data))
-      goto destroy_config;
-
-    struct GNUNET_IDENTITY_PublicKey key;
-
-    enum GNUNET_GenericReturnValue key_return = GNUNET_IDENTITY_public_key_from_string(key_data, &key);
-
-    GNUNET_free(key_data);
-
-    if (GNUNET_OK != key_return)
-      goto destroy_config;
-
-    session = create_member_session(member, &key);
-
-    unsigned long long numeric_value;
-
-    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "session", "start", &numeric_value))
-      session->start.abs_value_us = numeric_value;
-
-    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "session", "closed", &numeric_value))
-      session->closed = (GNUNET_YES == numeric_value? GNUNET_YES : GNUNET_NO);
-
-    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(cfg, "session", "completed", &numeric_value))
-      session->completed = (GNUNET_YES == numeric_value? GNUNET_YES : GNUNET_NO);
-  }
-
-destroy_config:
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-free_config:
-  GNUNET_free(config_file);
-
-  if (!session)
-    return;
-
-  char *history_file;
-  GNUNET_asprintf (&history_file, "%s%s", directory, "history.map");
-
-  load_member_session_history (session, history_file);
-  GNUNET_free(history_file);
-
-  char *messages_file;
-  GNUNET_asprintf (&messages_file, "%s%s", directory, "messages.list");
-
-  load_list_messages(&(session->messages), messages_file);
-  GNUNET_free(messages_file);
-
-  add_member_session(member, session);
-}
-
-static struct GNUNET_MESSENGER_MemberSession*
-get_cycle_safe_next_session (struct GNUNET_MESSENGER_MemberSession *session, struct GNUNET_MESSENGER_MemberSession *next)
-{
-  if (!next)
-    return NULL;
-
-  struct GNUNET_MESSENGER_MemberSession *check = next;
-
-  do {
-    if (check == session)
-      return NULL;
-
-    check = check->next;
-  } while (check);
-
-  return next;
-}
-
-void
-load_member_session_next (struct GNUNET_MESSENGER_MemberSession *session, const char *directory)
-{
-  GNUNET_assert ((session) && (directory));
-
-  char *config_file;
-  GNUNET_asprintf (&config_file, "%s%s", directory, "session.cfg");
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (config_file))
-    goto free_config;
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  if (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, config_file))
-  {
-    char *key_data;
-
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "session", "next_key", &key_data))
-      goto destroy_config;
-
-    struct GNUNET_IDENTITY_PublicKey next_key;
-
-    enum GNUNET_GenericReturnValue key_return = GNUNET_IDENTITY_public_key_from_string(key_data, &next_key);
-
-    GNUNET_free(key_data);
-
-    if (GNUNET_OK != key_return)
-      goto destroy_config;
-
-    struct GNUNET_ShortHashCode next_id;
-
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_data (cfg, "session", "next_id", &next_id, sizeof(next_id)))
-      goto destroy_config;
-
-    struct GNUNET_MESSENGER_Member *member = get_store_member(session->member->store, &next_id);
-
-    session->next = get_cycle_safe_next_session(
-        session, member? get_member_session (member, &next_key) : NULL
-    );
-
-    if (session->next)
-      session->next->prev = session;
-  }
-
-destroy_config:
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-free_config:
-  GNUNET_free(config_file);
-}
-
-static int
-iterate_save_member_session_history_hentries (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_DISK_FileHandle *handle = cls;
-  unsigned char ownership = value? GNUNET_YES : GNUNET_NO;
-
-  GNUNET_DISK_file_write(handle, key, sizeof(*key));
-  GNUNET_DISK_file_write(handle, &ownership, sizeof(ownership));
-
-  return GNUNET_YES;
-}
-
-static void
-save_member_session_history (struct GNUNET_MESSENGER_MemberSession *session, const char *path)
-{
-  GNUNET_assert((session) && (path));
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open(
-      path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
-  );
-
-  if (!handle)
-    return;
-
-  GNUNET_DISK_file_seek(handle, 0, GNUNET_DISK_SEEK_SET);
-
-  GNUNET_CONTAINER_multihashmap_iterate(
-      session->history,
-      iterate_save_member_session_history_hentries,
-      handle
-  );
-
-  GNUNET_DISK_file_sync(handle);
-  GNUNET_DISK_file_close(handle);
-}
-
-void
-save_member_session (struct GNUNET_MESSENGER_MemberSession *session, const char *directory)
-{
-  GNUNET_assert ((session) && (directory));
-
-  char *config_file;
-  GNUNET_asprintf (&config_file, "%s%s", directory, "session.cfg");
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  char *key_data = GNUNET_IDENTITY_public_key_to_string(get_member_session_public_key(session));
-
-  if (key_data)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg, "session", "key", key_data);
-
-    GNUNET_free(key_data);
-  }
-
-  if (session->next)
-  {
-    const struct GNUNET_ShortHashCode *next_id = get_member_session_id(session->next);
-
-    char *next_id_data = GNUNET_STRINGS_data_to_string_alloc (next_id, sizeof(*next_id));
-
-    if (next_id_data)
-    {
-      GNUNET_CONFIGURATION_set_value_string (cfg, "session", "next_id", next_id_data);
-
-      GNUNET_free(next_id_data);
-    }
-
-    key_data = GNUNET_IDENTITY_public_key_to_string(get_member_session_public_key(session->next));
-
-    if (key_data)
-    {
-      GNUNET_CONFIGURATION_set_value_string (cfg, "session", "next_key", key_data);
-
-      GNUNET_free(key_data);
-    }
-  }
-
-  GNUNET_CONFIGURATION_set_value_number(cfg, "session", "start", session->start.abs_value_us);
-
-  GNUNET_CONFIGURATION_set_value_number (cfg, "session", "closed", session->closed);
-  GNUNET_CONFIGURATION_set_value_number (cfg, "session", "completed", session->completed);
-
-  GNUNET_CONFIGURATION_write (cfg, config_file);
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-  GNUNET_free(config_file);
-
-  char *history_file;
-  GNUNET_asprintf (&history_file, "%s%s", directory, "history.map");
-
-  save_member_session_history (session, history_file);
-  GNUNET_free(history_file);
-
-  char *messages_file;
-  GNUNET_asprintf (&messages_file, "%s%s", directory, "messages.list");
-
-  save_list_messages(&(session->messages), messages_file);
-  GNUNET_free(messages_file);
-}
diff --git a/src/messenger/gnunet-service-messenger_member_session.h b/src/messenger/gnunet-service-messenger_member_session.h
deleted file mode 100644
index bf4d10f67..000000000
--- a/src/messenger/gnunet-service-messenger_member_session.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_member_session.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
-#define GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_time_lib.h"
-
-#include "gnunet-service-messenger_member.h"
-
-#include "messenger_api_contact.h"
-
-struct GNUNET_MESSENGER_MemberSession {
-  struct GNUNET_MESSENGER_Member *member;
-
-  struct GNUNET_IDENTITY_PublicKey public_key;
-  struct GNUNET_HashCode context;
-
-  struct GNUNET_MESSENGER_Contact *contact;
-
-  struct GNUNET_CONTAINER_MultiHashMap *history;
-  struct GNUNET_MESSENGER_ListMessages messages;
-
-  struct GNUNET_MESSENGER_MemberSession* prev;
-  struct GNUNET_MESSENGER_MemberSession* next;
-
-  struct GNUNET_TIME_Absolute start;
-
-  int closed;
-  int completed;
-};
-
-/**
- * Creates and allocates a new member session of a <i>member</i> with a given
- * public key.
- *
- * If the creation fails, NULL gets returned.
- *
- * @param[in/out] member Member
- * @param[in] pubkey Public key of EGO
- * @return New member session
- */
-struct GNUNET_MESSENGER_MemberSession*
-create_member_session (struct GNUNET_MESSENGER_Member *member,
-                       const struct GNUNET_IDENTITY_PublicKey *pubkey);
-
-/**
- * Creates and allocates a new member session closing and replacing a given
- * other <i>session</i> of the same member. The new session could have significant
- * changes to the members public key or its member id depending on the used
- * <i>message</i> to switch session. The new session will be linked to the old
- * one.
- *
- * @param[in/out] session Old member session
- * @param[in] message Message
- * @param[in] hash Hash of message
- * @return New member session
- */
-struct GNUNET_MESSENGER_MemberSession*
-switch_member_session (struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message,
-                       const struct GNUNET_HashCode *hash);
-
-/**
- * Destroys a member session and frees its memory fully.
- *
- * @param[in/out] session Member session
- */
-void
-destroy_member_session(struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Resets a given member <i>session</i> which re-opens a member
- * session for new usage. Every connection to other sessions will be
- * be dropped. The member sessions messages will be cleared but old
- * history from uncompleted sessions however can be reused!
- *
- * @param[in/out] session Member session
- * @param[in] hash Hash of initial message (JOIN message!)
- * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
- */
-int
-reset_member_session (struct GNUNET_MESSENGER_MemberSession* session,
-                      const struct GNUNET_HashCode *hash);
-
-/**
- * Closes a given member <i>session</i> which opens the request
- * for completion of the given member session.
- *
- * Closing a session may complete a session and can't be used without
- * a reset! ( @see #reset_member_session() )
- *
- * @param[in/out] session Member session
- */
-void
-close_member_session (struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns if the given member <i>session</i> has been closed.
- *
- * @param[in] session Member session
- * @return #GNUNET_YES or #GNUNET_NO
- */
-int
-is_member_session_closed (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns if the given member <i>session</i> has been completed.
- *
- * A completed member session can't verify any message as its own and
- * it won't add any message to its history.
- *
- * @param[in] session Member session
- * @return #GNUNET_YES or #GNUNET_NO
- */
-int
-is_member_session_completed (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns the timestamp of the member <i>session</i>'s start.
- *
- * @param[in] session Member session
- * @return Absolute timestamp
- */
-struct GNUNET_TIME_Absolute
-get_member_session_start (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns the key of the room a given member <i>session</i> belongs to.
- *
- * @param[in] session Member session
- * @return Key of room
- */
-const struct GNUNET_HashCode*
-get_member_session_key (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns the member id of a given member <i>session</i>.
- *
- * @param[in] session Member session
- * @return Member id
- */
-const struct GNUNET_ShortHashCode*
-get_member_session_id (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns the public key from an EGO of a given member <i>session</i>.
- *
- * @param[in] session Member session
- * @return Public key of EGO
- */
-const struct GNUNET_IDENTITY_PublicKey*
-get_member_session_public_key (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns the member context of a given member <i>session</i>.
- *
- * @param[in] session Member session
- * @return Member context as hash
- */
-const struct GNUNET_HashCode*
-get_member_session_context (const struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Returns the contact which is connected to a given member <i>session</i>.
- *
- * @param[in] session Member session
- * @return Contact
- */
-struct GNUNET_MESSENGER_Contact*
-get_member_session_contact (struct GNUNET_MESSENGER_MemberSession* session);
-
-/**
- * Verifies a given member <i>session</i> as sender of a selected <i>message</i> and
- * its <i>hash</i>. The function returns #GNUNET_OK if the message session is verified
- * as sender, otherwise #GNUNET_SYSERR.
- *
- * @see #is_member_session_completed() for verification.
- *
- * @param[in] session Member session
- * @param[in] message Message
- * @param[in] hash Hash of message
- * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
- */
-int
-verify_member_session_as_sender (const struct GNUNET_MESSENGER_MemberSession *session,
-                                 const struct GNUNET_MESSENGER_Message *message,
-                                 const struct GNUNET_HashCode *hash);
-
-/**
- * Checks the history of a <i>session</i> for a specific message which is identified
- * by its <i>hash</i> and if the <i>ownership</i> flag is set, if the message is
- * owned by the sessions contact.
- *
- * @param[in] session Member session
- * @param[in] hash Hash of message
- * @param[in] ownership Ownership flag
- * @return #GNUNET_YES if found, otherwise #GNUNET_NO
- */
-int
-check_member_session_history (const struct GNUNET_MESSENGER_MemberSession *session,
-                              const struct GNUNET_HashCode *hash, int ownership);
-
-/**
- * Adds a given <i>message</i> to the history of a <i>session</i> using the messages
- * <i>hash</i>. The ownership will be set automatically.
- *
- * @see #is_member_session_completed() for updating a history.
- *
- * @param[in/out] session Member session
- * @param[in] message Message
- * @param[in] hash Hash of message
- */
-void
-update_member_session_history (struct GNUNET_MESSENGER_MemberSession *session,
-                               const struct GNUNET_MESSENGER_Message *message,
-                               const struct GNUNET_HashCode *hash);
-
-/**
- * Removes a message from the history of a <i>session</i> using the messages
- * <i>hash</i>.
- *
- * @param[in/out] session Member session
- * @param[in] hash Hash of message
- */
-void
-clear_member_session_history (struct GNUNET_MESSENGER_MemberSession *session,
-                              const struct GNUNET_HashCode *hash);
-
-/**
- * Loads data from a <i>directory</i> into a new allocated and created member
- * session of a <i>member</i> if the required information can be read from the
- * content of the given directory.
- *
- * @param[out] member Member
- * @param[in] directory Path to a directory
- */
-void
-load_member_session (struct GNUNET_MESSENGER_Member *member, const char *directory);
-
-/**
- * Loads the connection from one <i>session</i> to another through the
- * next attribute. Necessary information will be loaded from a configuration
- * file inside of a given <i>directory</i>.
- *
- * @param[in/out] session Member session
- * @param[in] directory Path to a directory
- */
-void
-load_member_session_next (struct GNUNET_MESSENGER_MemberSession *session, const char *directory);
-
-/**
- * Saves data from a member <i>session</i> into a <i>directory</i> which can be
- * load to restore the member session completely.
- *
- * @param[in] session Member session
- * @param[in] directory Path to a directory
- */
-void
-save_member_session (struct GNUNET_MESSENGER_MemberSession *session, const char *directory);
-
-#endif //GNUNET_SERVICE_MESSENGER_MEMBER_SESSION_H
diff --git a/src/messenger/gnunet-service-messenger_member_store.c b/src/messenger/gnunet-service-messenger_member_store.c
deleted file mode 100644
index 2925965d4..000000000
--- a/src/messenger/gnunet-service-messenger_member_store.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_member_store.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_member_store.h"
-
-#include "gnunet-service-messenger_member.h"
-#include "gnunet-service-messenger_service.h"
-#include "gnunet-service-messenger_room.h"
-
-void
-init_member_store (struct GNUNET_MESSENGER_MemberStore *store, struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert ((store) && (room));
-
-  store->room = room;
-  store->members = GNUNET_CONTAINER_multishortmap_create(8, GNUNET_NO);
-}
-
-static int
-iterate_destroy_members (void *cls, const struct GNUNET_ShortHashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Member *member = value;
-  destroy_member(member);
-  return GNUNET_YES;
-}
-
-void
-clear_member_store (struct GNUNET_MESSENGER_MemberStore *store)
-{
-  GNUNET_assert ((store) && (store->members));
-
-  GNUNET_CONTAINER_multishortmap_iterate (store->members, iterate_destroy_members, NULL);
-  GNUNET_CONTAINER_multishortmap_destroy (store->members);
-}
-
-
-struct GNUNET_MESSENGER_ContactStore*
-get_member_contact_store (struct GNUNET_MESSENGER_MemberStore *store)
-{
-  GNUNET_assert ((store) && (store->room));
-
-  struct GNUNET_MESSENGER_SrvRoom *room = store->room;
-
-  return get_service_contact_store(room->service);
-}
-
-const struct GNUNET_HashCode*
-get_member_store_key (const struct GNUNET_MESSENGER_MemberStore *store)
-{
-  GNUNET_assert (store);
-
-  return get_room_key((const struct GNUNET_MESSENGER_SrvRoom*) store->room);
-}
-
-static int
-callback_scan_for_members (void *cls, const char *filename)
-{
-  struct GNUNET_MESSENGER_MemberStore *store = cls;
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (filename, GNUNET_YES))
-  {
-    char *directory;
-
-    GNUNET_asprintf (&directory, "%s%c", filename, DIR_SEPARATOR);
-
-    load_member(store, directory);
-
-    GNUNET_free(directory);
-  }
-
-  return GNUNET_OK;
-}
-
-static int
-iterate_load_next_member_sessions (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
-{
-  const char *sync_dir = cls;
-
-  struct GNUNET_MESSENGER_Member *member = value;
-
-  if (!member)
-    return GNUNET_YES;
-
-  char *member_dir;
-  GNUNET_asprintf (&member_dir, "%s%s%c", sync_dir, GNUNET_sh2s(id), DIR_SEPARATOR);
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (member_dir, GNUNET_YES))
-    load_member_next_sessions (member, member_dir);
-
-  GNUNET_free(member_dir);
-  return GNUNET_YES;
-}
-
-static int
-iterate_sync_member_contacts (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
-{
-  struct GNUNET_MESSENGER_Member *member = value;
-
-  if (!member)
-    return GNUNET_YES;
-
-  sync_member_contacts (member);
-  return GNUNET_YES;
-}
-
-void
-load_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *directory)
-{
-  GNUNET_assert ((store) && (directory));
-
-  char *scan_dir;
-  GNUNET_asprintf (&scan_dir, "%s%s%c", directory, "members", DIR_SEPARATOR);
-
-  if (GNUNET_OK == GNUNET_DISK_directory_test (scan_dir, GNUNET_YES))
-    GNUNET_DISK_directory_scan (scan_dir, callback_scan_for_members, store);
-
-  GNUNET_CONTAINER_multishortmap_iterate(store->members, iterate_load_next_member_sessions, scan_dir);
-  GNUNET_CONTAINER_multishortmap_iterate(store->members, iterate_sync_member_contacts, NULL);
-
-  GNUNET_free(scan_dir);
-}
-
-static int
-iterate_save_members (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
-{
-  const char *save_dir = cls;
-
-  struct GNUNET_MESSENGER_Member *member = value;
-
-  if (!member)
-    return GNUNET_YES;
-
-  char *member_dir;
-  GNUNET_asprintf (&member_dir, "%s%s%c", save_dir, GNUNET_sh2s(id), DIR_SEPARATOR);
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (member_dir, GNUNET_NO)) ||
-      (GNUNET_OK == GNUNET_DISK_directory_create (member_dir)))
-    save_member(member, member_dir);
-
-  GNUNET_free(member_dir);
-  return GNUNET_YES;
-}
-
-void
-save_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *directory)
-{
-  GNUNET_assert ((store) && (directory));
-
-  char* save_dir;
-  GNUNET_asprintf (&save_dir, "%s%s%c", directory, "members", DIR_SEPARATOR);
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
-      (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
-    GNUNET_CONTAINER_multishortmap_iterate(store->members, iterate_save_members, save_dir);
-
-  GNUNET_free(save_dir);
-}
-
-struct GNUNET_MESSENGER_Member*
-get_store_member (const struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id)
-{
-  GNUNET_assert ((store) && (store->members) && (id));
-
-  return GNUNET_CONTAINER_multishortmap_get (store->members, id);
-}
-
-struct GNUNET_MESSENGER_Member*
-get_store_member_of (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_MESSENGER_Message *message)
-{
-  if ((GNUNET_MESSENGER_KIND_INFO == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_JOIN == message->header.kind))
-    return add_store_member(store, &(message->header.sender_id));
-  else
-    return get_store_member(store, &(message->header.sender_id));
-}
-
-struct GNUNET_MESSENGER_Member*
-add_store_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id)
-{
-  GNUNET_assert ((store) && (store->members));
-
-  struct GNUNET_MESSENGER_Member *member = id? get_store_member(store, id) : NULL;
-
-  if (member)
-    return member;
-
-  member = create_member(store, id);
-
-  if (!member)
-    return NULL;
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multishortmap_put (store->members, get_member_id(member), member,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-  {
-    destroy_member(member);
-    return NULL;
-  }
-
-  return member;
-}
-
-struct GNUNET_MESSENGER_ClosureIterateMembers {
-  GNUNET_MESSENGER_MemberIteratorCallback it;
-  void *cls;
-};
-
-static int
-iterate_store_members_it (void *cls, const struct GNUNET_ShortHashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_ClosureIterateMembers *iterate = cls;
-  struct GNUNET_MESSENGER_Member *member = value;
-
-  return iterate_member_sessions(member, iterate->it, iterate->cls);
-}
-
-int
-iterate_store_members (struct GNUNET_MESSENGER_MemberStore *store, GNUNET_MESSENGER_MemberIteratorCallback it,
-                       void* cls)
-{
-  GNUNET_assert ((store) && (store->members) && (it));
-
-  struct GNUNET_MESSENGER_ClosureIterateMembers iterate;
-
-  iterate.it = it;
-  iterate.cls = cls;
-
-  return GNUNET_CONTAINER_multishortmap_iterate(store->members, iterate_store_members_it, &iterate);
-}
diff --git a/src/messenger/gnunet-service-messenger_member_store.h b/src/messenger/gnunet-service-messenger_member_store.h
deleted file mode 100644
index 859e4683d..000000000
--- a/src/messenger/gnunet-service-messenger_member_store.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_member_store.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
-#define GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_identity_service.h"
-#include "messenger_api_message.h"
-
-struct GNUNET_MESSENGER_SrvRoom;
-
-struct GNUNET_MESSENGER_Member;
-struct GNUNET_MESSENGER_MemberSession;
-
-struct GNUNET_MESSENGER_MemberStore
-{
-  struct GNUNET_MESSENGER_SrvRoom *room;
-
-  struct GNUNET_CONTAINER_MultiShortmap *members;
-};
-
-typedef int (*GNUNET_MESSENGER_MemberIteratorCallback) (
-    void *cls,
-    const struct GNUNET_IDENTITY_PublicKey *public_key,
-    struct GNUNET_MESSENGER_MemberSession *session);
-
-/**
- * Initializes a member <i>store</i> as fully empty connected to a <i>room</i>.
- *
- * @param[out] store Member store
- * @param room Room
- */
-void
-init_member_store (struct GNUNET_MESSENGER_MemberStore *store, struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Clears a member <i>store</i>, wipes its content and deallocates its memory.
- *
- * @param[in/out] store Member store
- */
-void
-clear_member_store (struct GNUNET_MESSENGER_MemberStore *store);
-
-/**
- * Returns the used contact store of a given member <i>store</i>.
- *
- * @param[in/out] store Member store
- * @return Contact store
- */
-struct GNUNET_MESSENGER_ContactStore*
-get_member_contact_store (struct GNUNET_MESSENGER_MemberStore *store);
-
-/**
- * Returns the shared secret you need to access a room of the <i>store</i>.
- *
- * @param[in] store Member store
- * @return Shared secret
- */
-const struct GNUNET_HashCode*
-get_member_store_key (const struct GNUNET_MESSENGER_MemberStore *store);
-
-/**
- * Loads members from a directory into a member <i>store</i>.
- *
- * @param[out] store Member store
- * @param[in] directory Path to a directory
- */
-void
-load_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *directory);
-
-/**
- * Saves members from a member <i>store</i> into a directory.
- *
- * @param[in] store Member store
- * @param[in] directory Path to a directory
- */
-void
-save_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *directory);
-
-/**
- * Returns the member in a <i>store</i> identified by a given <i>id</i>. If the <i>store</i>
- * does not contain a member with the given <i>id</i>, NULL gets returned.
- *
- * @param[in] store Member store
- * @param[in] id Member id
- * @return Member or NULL
- */
-struct GNUNET_MESSENGER_Member*
-get_store_member (const struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id);
-
-/**
- * Returns the member of a <i>store</i> using a sender id of a given <i>message</i>.
- * If the member does not provide a matching session, NULL gets returned.
- *
- * @param[in/out] store Member store
- * @param[in] message Message
- * @return Member or NULL
- */
-struct GNUNET_MESSENGER_Member*
-get_store_member_of (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Adds a member to a <i>store</i> under a specific <i>id</i> and returns it on success.
- *
- * @param[in/out] store Member store
- * @param[in] id Member id
- * @return Member or NULL
- */
-struct GNUNET_MESSENGER_Member*
-add_store_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id);
-
-/**
- * Iterate through all member sessions currently connected to the members of the given
- * member <i>store</i> and call the provided iterator callback with a selected closure.
- * The function will return the amount of members it iterated through.
- *
- * @param[in/out] store Member store
- * @param[in] it Iterator callback
- * @param[in/out] cls Closure
- * @return Amount of members iterated through
- */
-int
-iterate_store_members (struct GNUNET_MESSENGER_MemberStore *store, GNUNET_MESSENGER_MemberIteratorCallback it,
-                       void* cls);
-
-#endif //GNUNET_SERVICE_MESSENGER_MEMBER_STORE_H
diff --git a/src/messenger/gnunet-service-messenger_message_handle.c b/src/messenger/gnunet-service-messenger_message_handle.c
deleted file mode 100644
index 86f2b901a..000000000
--- a/src/messenger/gnunet-service-messenger_message_handle.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_handle.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_message_handle.h"
-
-static void
-handle_session_switch (struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_MemberSession *next = switch_member_session(session, message, hash);
-
-  if (next != session)
-    add_member_session(next->member, next);
-}
-
-void
-handle_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member (%s) joins room (%s).\n",
-             GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s(get_room_key(room)));
-
-  if (GNUNET_OK != reset_member_session(session, hash))
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Resetting member session failed!\n");
-
-  solve_room_member_collisions (
-      room,
-      &(message->body.join.key),
-      &(message->header.sender_id),
-      GNUNET_TIME_absolute_ntoh(message->header.timestamp)
-  );
-}
-
-void
-handle_message_leave (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Member (%s) leaves room (%s).\n",
-             GNUNET_sh2s (&(message->header.sender_id)), GNUNET_h2s(get_room_key(room)));
-
-  close_member_session(session);
-}
-
-void
-handle_message_name (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_Contact *contact = get_member_session_contact(session);
-
-  if (!contact)
-    return;
-
-  set_contact_name (contact, message->body.name.name);
-}
-
-void
-handle_message_key (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                    const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  handle_session_switch (session, message, hash);
-}
-
-void
-handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if (GNUNET_NO == contains_list_tunnels (&(room->basement), &(message->body.peer.peer)))
-    add_to_list_tunnels (&(room->basement), &(message->body.peer.peer));
-
-  if (room->peer_message)
-    rebuild_room_basement_structure (room);
-}
-
-void
-handle_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  handle_session_switch (session, message, hash);
-
-  solve_room_member_collisions (
-      room,
-      get_member_session_public_key(session),
-      &(message->body.id.id),
-      GNUNET_TIME_absolute_ntoh(message->header.timestamp)
-  );
-}
-
-void
-handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_ListTunnel *element = find_list_tunnels (&(room->basement), &(message->body.peer.peer), NULL);
-
-  if (!element)
-    return;
-
-  remove_from_list_tunnels (&(room->basement), element);
-
-  if (room->peer_message)
-    rebuild_room_basement_structure (room);
-}
-
-void
-handle_message_delete (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_TIME_Relative delay = GNUNET_TIME_relative_ntoh (message->body.deletion.delay);
-  struct GNUNET_TIME_Absolute action = GNUNET_TIME_absolute_ntoh (message->header.timestamp);
-
-  action = GNUNET_TIME_absolute_add (action, delay);
-  delay = GNUNET_TIME_absolute_get_difference (GNUNET_TIME_absolute_get (), action);
-
-  delete_room_message (room, session, &(message->body.deletion.hash), delay);
-}
diff --git a/src/messenger/gnunet-service-messenger_message_handle.h b/src/messenger/gnunet-service-messenger_message_handle.h
deleted file mode 100644
index 844142b77..000000000
--- a/src/messenger/gnunet-service-messenger_message_handle.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_handle.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
-#define GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-
-#include "gnunet-service-messenger_message_kind.h"
-
-#include "gnunet-service-messenger_member_session.h"
-#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
-
-/**
- * Handles a received or sent join message to make changes of current member information.
- * (add matching member and clear member info)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message JOIN-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent leave message to make changes of current member information.
- * (remove matching member and clear member info)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message LEAVE-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_leave (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent name message to rename a current member.
- * (change name of matching member)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message NAME-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_name (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent key message to change the key of a member and rearrange the contacts accordingly.
- * (move the member in the contacts and change its key)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message KEY-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_key (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                    const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent peer message to make changes of the basement in the room.
- * (add a new peer to the basement and restructure connections based on updated list of peers)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message PEER-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent id message to change a members id.
- * (change id of matching member)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message ID-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent miss message to drop a peer from the basement in the room.
- * (remove a peer from the basement and restructure connections based on updated list of peers)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message MISS-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received or sent delete message to delete a specific message from the store.
- * (remove a message from the store of a room under a given delay)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
- * @param[in] message DELETE-Message
- * @param[in] hash Hash of the message
- */
-void
-handle_message_delete (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                       const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-#endif //GNUNET_SERVICE_MESSENGER_MESSAGE_HANDLE_H
diff --git a/src/messenger/gnunet-service-messenger_message_kind.c b/src/messenger/gnunet-service-messenger_message_kind.c
deleted file mode 100644
index 3edcade91..000000000
--- a/src/messenger/gnunet-service-messenger_message_kind.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_kind.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_message_kind.h"
-
-#include "messenger_api_util.h"
-
-struct GNUNET_MESSENGER_Message*
-create_message_info (const struct GNUNET_MESSENGER_Ego *ego)
-{
-  if (!ego)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_INFO);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.info.host_key), &(ego->pub), sizeof(ego->pub));
-
-  message->body.info.messenger_version = GNUNET_MESSENGER_VERSION;
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_join (const struct GNUNET_MESSENGER_Ego *ego)
-{
-  if (!ego)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_JOIN);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.join.key), &(ego->pub), sizeof(ego->pub));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_leave ()
-{
-  return create_message (GNUNET_MESSENGER_KIND_LEAVE);
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_name (const char *name)
-{
-  if (!name)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_NAME);
-
-  if (!message)
-    return NULL;
-
-  message->body.name.name = GNUNET_strdup(name);
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_key (const struct GNUNET_IDENTITY_PrivateKey *key)
-{
-  if (!key)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_KEY);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_IDENTITY_key_get_public (key, &(message->body.key.key));
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_peer (const struct GNUNET_MESSENGER_Service *service)
-{
-  if (!service)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_PEER);
-
-  if (!message)
-    return NULL;
-
-  if (GNUNET_OK == get_service_peer_identity (service, &(message->body.peer.peer)))
-    return message;
-  else
-  {
-    destroy_message (message);
-    return NULL;
-  }
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_id (const struct GNUNET_ShortHashCode *unique_id)
-{
-  if (!unique_id)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_ID);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.id.id), unique_id, sizeof(struct GNUNET_ShortHashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_miss (const struct GNUNET_PeerIdentity *peer)
-{
-  if (!peer)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_MISS);
-
-  if (!message)
-  {
-    return NULL;
-  }
-
-  GNUNET_memcpy(&(message->body.miss.peer), peer, sizeof(struct GNUNET_PeerIdentity));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_merge (const struct GNUNET_HashCode *previous)
-{
-  if (!previous)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_MERGE);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.merge.previous), previous, sizeof(struct GNUNET_HashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_request (const struct GNUNET_HashCode *hash)
-{
-  if (!hash)
-    return NULL;
-
-  struct GNUNET_HashCode zero;
-  memset (&zero, 0, sizeof(zero));
-
-  if (0 == GNUNET_CRYPTO_hash_cmp (hash, &zero))
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_REQUEST);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.request.hash), hash, sizeof(struct GNUNET_HashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_invite (const struct GNUNET_PeerIdentity *door, const struct GNUNET_HashCode *key)
-{
-  if ((!door) || (!key))
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_INVITE);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.invite.door), door, sizeof(struct GNUNET_PeerIdentity));
-  GNUNET_memcpy(&(message->body.invite.key), key, sizeof(struct GNUNET_HashCode));
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_text (const char *text)
-{
-  if (!text)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_TEXT);
-
-  if (!message)
-    return NULL;
-
-  message->body.text.text = GNUNET_strdup(text);
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-create_message_delete (const struct GNUNET_HashCode *hash, const struct GNUNET_TIME_Relative delay)
-{
-  if (!hash)
-    return NULL;
-
-  struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_DELETE);
-
-  if (!message)
-    return NULL;
-
-  GNUNET_memcpy(&(message->body.deletion.hash), hash, sizeof(struct GNUNET_HashCode));
-  message->body.deletion.delay = GNUNET_TIME_relative_hton (delay);
-
-  return message;
-}
diff --git a/src/messenger/gnunet-service-messenger_message_kind.h b/src/messenger/gnunet-service-messenger_message_kind.h
deleted file mode 100644
index c098868c0..000000000
--- a/src/messenger/gnunet-service-messenger_message_kind.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_kind.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
-#define GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
-
-#include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_time_lib.h"
-
-#include "messenger_api_message.h"
-#include "gnunet-service-messenger_service.h"
-#include "messenger_api_ego.h"
-
-/**
- * Creates and allocates a new info message containing the hosts EGO public key and a newly generated unique member id.
- * (all values are stored as copy)
- *
- * @param[in] ego EGO of the host
- * @param[in] members Map of all assigned member ids
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_info (const struct GNUNET_MESSENGER_Ego *ego);
-
-/**
- * Creates and allocates a new join message containing the clients EGO public key.
- * (all values are stored as copy)
- *
- * @param[in] ego EGO of the client
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_join (const struct GNUNET_MESSENGER_Ego *ego);
-
-/**
- * Creates and allocates a new leave message.
- *
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_leave ();
-
-/**
- * Creates and allocates a new name message containing the <i>name</i> to change to.
- * (all values are stored as copy)
- *
- * @param[in] name New name
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_name (const char *name);
-
-/**
- * Creates and allocates a new key message containing the public <i>key</i> to change to derived
- * from its private counterpart. (all values are stored as copy)
- *
- * @param[in] key Private key of EGO
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_key (const struct GNUNET_IDENTITY_PrivateKey *key);
-
-/**
- * Creates and allocates a new peer message containing a services peer identity.
- * (all values are stored as copy)
- *
- * @param[in] service Service
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_peer (const struct GNUNET_MESSENGER_Service *service);
-
-/**
- * Creates and allocates a new id message containing the unique member id to change to.
- * (all values are stored as copy)
- *
- * @param[in] unique_id Unique member id
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_id (const struct GNUNET_ShortHashCode *unique_id);
-
-/**
- * Creates and allocates a new miss message containing the missing <i>peer</i> identity.
- * (all values are stored as copy)
- *
- * @param[in] peer Missing peer identity
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_miss (const struct GNUNET_PeerIdentity *peer);
-
-/**
- * Creates and allocates a new merge message containing the hash of a second <i>previous</i> message
- * besides the regular previous message mentioned in a messages header.
- * (all values are stored as copy)
- *
- * @param[in] previous Hash of message
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_merge (const struct GNUNET_HashCode *previous);
-
-/**
- * Creates and allocates a new request message containing the <i>hash</i> of a missing message.
- * (all values are stored as copy)
- *
- * @param[in] hash Hash of message
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_request (const struct GNUNET_HashCode *hash);
-
-/**
- * Creates and allocates a new invite message containing the peer identity of an entrance peer
- * to a room using a given <i>key</i> as shared secret for communication.
- * (all values are stored as copy)
- *
- * @param[in] door Peer identity
- * @param[in] key Shared secret of a room
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_invite (const struct GNUNET_PeerIdentity *door, const struct GNUNET_HashCode *key);
-
-/**
- * Creates and allocates a new <i>text message containing a string representing text.
- * (all values are stored as copy)
- *
- * @param[in] text Text
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_text (const char *text);
-
-/**
- * Creates and allocates a new delete message containing the <i>hash</i> of a message to delete after a specific <i>delay</i>.
- * (all values are stored as copy)
- *
- * @param[in] hash Hash of message
- * @param[in] delay Delay of deletion
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message_delete (const struct GNUNET_HashCode *hash, const struct GNUNET_TIME_Relative delay);
-
-#endif //GNUNET_SERVICE_MESSENGER_MESSAGE_KIND_H
diff --git a/src/messenger/gnunet-service-messenger_message_recv.c b/src/messenger/gnunet-service-messenger_message_recv.c
deleted file mode 100644
index b2a5052d2..000000000
--- a/src/messenger/gnunet-service-messenger_message_recv.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_recv.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_message_recv.h"
-
-#include "gnunet-service-messenger_operation.h"
-
-static void
-forward_about_members (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                       struct GNUNET_MESSENGER_MemberSession *session, struct GNUNET_CONTAINER_MultiHashMap *map)
-{
-  if (session->prev)
-    forward_about_members (room, tunnel, session->prev, map);
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-  struct GNUNET_MESSENGER_ListMessage *element;
-
-  for (element = session->messages.head; element; element = element->next)
-  {
-    if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(map, &(element->hash)))
-      continue;
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(map, &(element->hash), NULL,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Forwarding of session message could be duplicated!\n");
-
-    const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, &(element->hash));
-
-    if (message)
-      forward_tunnel_message(tunnel, message, &(element->hash));
-  }
-}
-
-static int
-iterate_forward_members (void *cls, const struct GNUNET_IDENTITY_PublicKey *public_key,
-                              struct GNUNET_MESSENGER_MemberSession *session)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = cls;
-
-  if (GNUNET_YES == is_member_session_completed(session))
-    return GNUNET_YES;
-
-  struct GNUNET_CONTAINER_MultiHashMap *map = GNUNET_CONTAINER_multihashmap_create(4, GNUNET_NO);
-
-  forward_about_members (tunnel->room, tunnel, session, map);
-
-  GNUNET_CONTAINER_multihashmap_destroy(map);
-  return GNUNET_YES;
-}
-
-int
-recv_message_info (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  const uint32_t version = get_tunnel_messenger_version(tunnel);
-
-  if (GNUNET_OK != update_tunnel_messenger_version(tunnel, message->body.info.messenger_version))
-  {
-    disconnect_tunnel(tunnel);
-    return GNUNET_NO;
-  }
-
-  if (version == get_tunnel_messenger_version(tunnel))
-    return GNUNET_NO;
-
-  if (room->host)
-  {
-    const struct GNUNET_MESSENGER_Ego *ego = get_handle_ego(room->host);
-
-    send_tunnel_message (tunnel, room->host, create_message_info(ego));
-  }
-
-  struct GNUNET_PeerIdentity peer;
-  get_tunnel_peer_identity(tunnel, &peer);
-
-  if (GNUNET_YES != contains_list_tunnels(&(room->basement), &peer))
-  {
-    struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-
-    iterate_store_members(member_store, iterate_forward_members, tunnel);
-  }
-
-  check_room_peer_status(room, tunnel);
-
-  return GNUNET_NO;
-}
-
-int
-recv_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_PeerIdentity peer;
-  GNUNET_PEER_resolve (tunnel->peer, &peer);
-
-  if (0 == GNUNET_memcmp(&peer, &(message->body.peer.peer)))
-  {
-    if (!tunnel->peer_message)
-      tunnel->peer_message = GNUNET_new(struct GNUNET_HashCode);
-
-    GNUNET_memcpy(tunnel->peer_message, &hash, sizeof(hash));
-  }
-
-  return GNUNET_YES;
-}
-
-static void
-callback_found_message (void *cls, struct GNUNET_MESSENGER_SrvRoom *room,
-                        const struct GNUNET_MESSENGER_Message *message,
-                        const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = tunnel;
-
-  if (!message)
-  {
-    struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(room);
-
-    use_store_operation(
-        operation_store,
-        hash,
-        GNUNET_MESSENGER_OP_REQUEST,
-        GNUNET_MESSENGER_REQUEST_DELAY
-    );
-  }
-  else
-    forward_tunnel_message (tunnel, message, hash);
-}
-
-/*
- * Function returns GNUNET_NO to drop forwarding the request.
- * It will only be forwarded if it can't be answered!
- */
-int
-recv_message_request (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member_of(member_store, message);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Request for message (%s)\n", GNUNET_h2s (hash));
-
-  if (!member)
-    return GNUNET_NO;
-
-  struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of(member, message, hash);
-
-  if ((!session) || (GNUNET_YES != check_member_session_history(session, hash, GNUNET_NO)))
-    return GNUNET_NO;
-
-  if (GNUNET_NO == request_room_message(room, &(message->body.request.hash), session, callback_found_message, tunnel))
-    return GNUNET_YES;
-
-  return GNUNET_NO;
-}
diff --git a/src/messenger/gnunet-service-messenger_message_recv.h b/src/messenger/gnunet-service-messenger_message_recv.h
deleted file mode 100644
index 9cb36c466..000000000
--- a/src/messenger/gnunet-service-messenger_message_recv.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_recv.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
-#define GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-
-#include "gnunet-service-messenger_message_kind.h"
-
-#include "gnunet-service-messenger_member_session.h"
-#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
-
-/**
- * Handles a received info message to change the current member id to the one generated by
- * the host connected to. (all current tunnels will be informed about the id change)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] tunnel Receiving connection
- * @param[in] message INFO-Message
- * @param[in] hash Hash of the message
- * @return #GNUNET_NO to not forward the message
- */
-int
-recv_message_info (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received peer message to link it to its origin tunnel if the peer identity matches.
- * (the peer message and the member id can potentially be linked to the tunnel)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] tunnel Receiving connection
- * @param[in] message PEER-Message
- * @param[in] hash Hash of the message
- * @return #GNUNET_YES to forward the message
- */
-int
-recv_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a received request message by checking for the requested message and forwarding it back
- * if the message was found.
- * (this can also cause this peer to send a new request instead of only forwarding the received one)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] tunnel Receiving connection
- * @param[in] message REQUEST-Message
- * @param[in] hash Hash of the message
- * @return #GNUNET_YES or #GNUNET_NO depending on required forwarding
- */
-int
-recv_message_request (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-#endif //GNUNET_SERVICE_MESSENGER_MESSAGE_RECV_H
diff --git a/src/messenger/gnunet-service-messenger_message_send.c b/src/messenger/gnunet-service-messenger_message_send.c
deleted file mode 100644
index a59a178cc..000000000
--- a/src/messenger/gnunet-service-messenger_message_send.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_send.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_message_send.h"
-
-#include "gnunet-service-messenger_member.h"
-#include "gnunet-service-messenger_member_session.h"
-#include "gnunet-service-messenger_operation.h"
-
-void
-send_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  check_room_peer_status(room, NULL);
-}
-
-void
-send_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if (!room->peer_message)
-    room->peer_message = GNUNET_new(struct GNUNET_HashCode);
-
-  GNUNET_memcpy(room->peer_message, hash, sizeof(struct GNUNET_HashCode));
-}
-
-void
-send_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                 const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  change_handle_member_id (handle, get_room_key(room), &(message->body.id.id));
-}
-
-void
-send_message_request (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(room);
-
-  use_store_operation(
-      operation_store,
-      &(message->body.request.hash),
-      GNUNET_MESSENGER_OP_REQUEST,
-      GNUNET_MESSENGER_REQUEST_DELAY
-  );
-}
diff --git a/src/messenger/gnunet-service-messenger_message_send.h b/src/messenger/gnunet-service-messenger_message_send.h
deleted file mode 100644
index 63320ab17..000000000
--- a/src/messenger/gnunet-service-messenger_message_send.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_send.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
-#define GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-
-#include "gnunet-service-messenger_message_kind.h"
-
-#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_message.h"
-
-/**
- * Handles a sent join message to ensure growth of the decentralized room structure.
- * (if the service provides a peer message for this room currently, it will be forwarded)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
- * @param[in] message JOIN-Message
- * @param[in] hash Hash of the message
- */
-void
-send_message_join (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a sent peer message to update the rooms peer message of this service.
- * (a set peer message indicates this service being a part of the decentralized room structure)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
- * @param[in] message PEER-Message
- * @param[in] hash Hash of the message
- */
-void
-send_message_peer (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a sent id message to update the handles member id in the room.
- * (changing member id is useful to prevent collisions)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
- * @param[in] message ID-Message
- * @param[in] hash Hash of the message
- */
-void
-send_message_id (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                 const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a sent request message to trigger the request operation for this service.
- * (the request operation will deactivate the possibility of spamming requests)
- *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
- * @param[in] message PEER-Message
- * @param[in] hash Hash of the message
- */
-void
-send_message_request (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-#endif //GNUNET_SERVICE_MESSENGER_MESSAGE_SEND_H
diff --git a/src/messenger/gnunet-service-messenger_message_state.c b/src/messenger/gnunet-service-messenger_message_state.c
deleted file mode 100644
index cdd2d9712..000000000
--- a/src/messenger/gnunet-service-messenger_message_state.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_state.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_message_state.h"
-
-void
-init_message_state (struct GNUNET_MESSENGER_MessageState *state)
-{
-  GNUNET_assert(state);
-
-  init_list_messages (&(state->last_messages));
-}
-
-void
-clear_message_state (struct GNUNET_MESSENGER_MessageState *state)
-{
-  GNUNET_assert(state);
-
-  clear_list_messages (&(state->last_messages));
-}
-
-void
-get_message_state_chain_hash (const struct GNUNET_MESSENGER_MessageState *state,
-                              struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((state) && (hash));
-
-  if (state->last_messages.head)
-    GNUNET_memcpy(hash, &(state->last_messages.head->hash), sizeof(*hash));
-  else
-    memset (hash, 0, sizeof(*hash));
-}
-
-const struct GNUNET_HashCode*
-get_message_state_merge_hash (const struct GNUNET_MESSENGER_MessageState *state)
-{
-  GNUNET_assert(state);
-
-  if (state->last_messages.head == state->last_messages.tail)
-    return NULL;
-
-  return &(state->last_messages.tail->hash);
-}
-
-void
-update_message_state (struct GNUNET_MESSENGER_MessageState *state, int requested,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((state) && (message) && (hash));
-
-  if ((GNUNET_YES == requested) ||
-      (GNUNET_MESSENGER_KIND_INFO == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_REQUEST == message->header.kind))
-    return;
-
-  if (GNUNET_MESSENGER_KIND_MERGE == message->header.kind)
-    remove_from_list_messages(&(state->last_messages), &(message->body.merge.previous));
-  remove_from_list_messages(&(state->last_messages), &(message->header.previous));
-
-  add_to_list_messages (&(state->last_messages), hash);
-}
-
-void
-load_message_state (struct GNUNET_MESSENGER_MessageState *state, const char *path)
-{
-  GNUNET_assert((state) && (path));
-
-  char *last_messages_file;
-  GNUNET_asprintf (&last_messages_file, "%s%s", path, "last_messages.list");
-
-  load_list_messages(&(state->last_messages), last_messages_file);
-  GNUNET_free(last_messages_file);
-}
-
-void
-save_message_state (const struct GNUNET_MESSENGER_MessageState *state, const char *path)
-{
-  GNUNET_assert((state) && (path));
-
-  char *last_messages_file;
-  GNUNET_asprintf (&last_messages_file, "%s%s", path, "last_messages.list");
-
-  save_list_messages(&(state->last_messages), last_messages_file);
-  GNUNET_free(last_messages_file);
-}
-
-
diff --git a/src/messenger/gnunet-service-messenger_message_state.h b/src/messenger/gnunet-service-messenger_message_state.h
deleted file mode 100644
index dc8671df4..000000000
--- a/src/messenger/gnunet-service-messenger_message_state.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_state.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
-#define GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-
-#include "messenger_api_message.h"
-#include "gnunet-service-messenger_list_messages.h"
-
-struct GNUNET_MESSENGER_MessageState
-{
-  struct GNUNET_MESSENGER_ListMessages last_messages;
-};
-
-void
-init_message_state (struct GNUNET_MESSENGER_MessageState *state);
-
-void
-clear_message_state (struct GNUNET_MESSENGER_MessageState *state);
-
-void
-get_message_state_chain_hash (const struct GNUNET_MESSENGER_MessageState *state,
-                              struct GNUNET_HashCode *hash);
-
-const struct GNUNET_HashCode*
-get_message_state_merge_hash (const struct GNUNET_MESSENGER_MessageState *state);
-
-void
-update_message_state (struct GNUNET_MESSENGER_MessageState *state, int requested,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-void
-load_message_state (struct GNUNET_MESSENGER_MessageState *state, const char *path);
-
-void
-save_message_state (const struct GNUNET_MESSENGER_MessageState *state, const char *path);
-
-#endif //GNUNET_SERVICE_MESSENGER_MESSAGE_STATE_H
diff --git a/src/messenger/gnunet-service-messenger_message_store.c b/src/messenger/gnunet-service-messenger_message_store.c
deleted file mode 100644
index 1984eba21..000000000
--- a/src/messenger/gnunet-service-messenger_message_store.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_store.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_message_store.h"
-#include "messenger_api_message.h"
-
-void
-init_message_store (struct GNUNET_MESSENGER_MessageStore *store)
-{
-  GNUNET_assert(store);
-
-  store->storage_messages = NULL;
-
-  store->entries = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-  store->messages = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-  store->links = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-
-  store->rewrite_entries = GNUNET_NO;
-  store->write_links = GNUNET_NO;
-}
-
-static int
-iterate_destroy_entries (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MessageEntry *entry = value;
-
-  GNUNET_free(entry);
-
-  return GNUNET_YES;
-}
-
-static int
-iterate_destroy_messages (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Message *message = value;
-
-  destroy_message (message);
-
-  return GNUNET_YES;
-}
-
-static int
-iterate_destroy_links (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_HashCode *previous = value;
-
-  GNUNET_free(previous);
-
-  return GNUNET_YES;
-}
-
-void
-clear_message_store (struct GNUNET_MESSENGER_MessageStore *store)
-{
-  GNUNET_assert(store);
-
-  if (store->storage_messages)
-  {
-    GNUNET_DISK_file_close (store->storage_messages);
-
-    store->storage_messages = NULL;
-  }
-
-  GNUNET_CONTAINER_multihashmap_iterate (store->entries, iterate_destroy_entries, NULL);
-  GNUNET_CONTAINER_multihashmap_iterate (store->messages, iterate_destroy_messages, NULL);
-  GNUNET_CONTAINER_multihashmap_iterate (store->links, iterate_destroy_links, NULL);
-
-  GNUNET_CONTAINER_multihashmap_destroy (store->entries);
-  GNUNET_CONTAINER_multihashmap_destroy (store->messages);
-  GNUNET_CONTAINER_multihashmap_destroy (store->links);
-}
-
-struct GNUNET_MESSENGER_MessageEntryStorage
-{
-  struct GNUNET_HashCode hash;
-  struct GNUNET_MESSENGER_MessageEntry entry;
-};
-
-static void
-load_message_store_entries (struct GNUNET_MESSENGER_MessageStore *store, const char *filename)
-{
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ);
-
-  struct GNUNET_DISK_FileHandle *entries = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ, permission);
-
-  if (!entries)
-    return;
-
-  struct GNUNET_MESSENGER_MessageEntryStorage storage;
-  struct GNUNET_MESSENGER_MessageEntry *entry;
-
-  do
-  {
-    entry = GNUNET_new(struct GNUNET_MESSENGER_MessageEntry);
-
-    if (GNUNET_DISK_file_read (entries, &storage, sizeof(storage)) == sizeof(storage))
-    {
-      GNUNET_memcpy(entry, &(storage.entry), sizeof(*entry));
-
-      if ((GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (store->entries, &(storage.hash))) ||
-          (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (store->entries, &(storage.hash), entry,
-                                                           GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
-      {
-        store->rewrite_entries = GNUNET_YES;
-        GNUNET_free(entry);
-      }
-    }
-    else
-    {
-      GNUNET_free(entry);
-
-      entry = NULL;
-    }
-  }
-  while (entry);
-
-  GNUNET_DISK_file_close (entries);
-}
-
-struct GNUNET_MESSENGER_MessageLinkStorage
-{
-  struct GNUNET_HashCode hash;
-  struct GNUNET_MESSENGER_MessageLink link;
-};
-
-static void
-load_message_store_links (struct GNUNET_MESSENGER_MessageStore *store, const char *filename)
-{
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ);
-
-  struct GNUNET_DISK_FileHandle *entries = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ, permission);
-
-  if (!entries)
-    return;
-
-  struct GNUNET_MESSENGER_MessageLinkStorage storage;
-  struct GNUNET_MESSENGER_MessageLink *link = NULL;
-
-  memset(&storage, 0, sizeof(storage));
-
-  do
-  {
-    if ((sizeof(storage.hash) != GNUNET_DISK_file_read (entries, &(storage.hash), sizeof(storage.hash))) ||
-        (sizeof(storage.link.multiple) != GNUNET_DISK_file_read (entries, &(storage.link.multiple), sizeof(storage.link.multiple))) ||
-        (sizeof(storage.link.first) != GNUNET_DISK_file_read (entries, &(storage.link.first), sizeof(storage.link.first))) ||
-        ((GNUNET_YES == storage.link.multiple) &&
-         (sizeof(storage.link.second) != GNUNET_DISK_file_read (entries, &(storage.link.second), sizeof(storage.link.second)))))
-      break;
-
-    link = GNUNET_new(struct GNUNET_MESSENGER_MessageLink);
-
-    GNUNET_memcpy(link, &(storage.link), sizeof(*link));
-
-    if ((GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (store->links, &(storage.hash))) ||
-        (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (store->links, &(storage.hash), link,
-                                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
-      break;
-  }
-  while (link);
-
-  if (link)
-    GNUNET_free(link);
-
-  GNUNET_DISK_file_close (entries);
-}
-
-void
-load_message_store (struct GNUNET_MESSENGER_MessageStore *store, const char *directory)
-{
-  GNUNET_assert((store) && (directory));
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  if (store->storage_messages)
-    GNUNET_DISK_file_close (store->storage_messages);
-
-  char *filename;
-  GNUNET_asprintf (&filename, "%s%s", directory, "messages.store");
-
-  if (GNUNET_YES == GNUNET_DISK_file_test (filename))
-    store->storage_messages = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READWRITE, permission);
-  else
-    store->storage_messages = NULL;
-
-  GNUNET_free(filename);
-
-  if (!store->storage_messages)
-    return;
-
-  GNUNET_asprintf (&filename, "%s%s", directory, "entries.store");
-
-  if (GNUNET_YES == GNUNET_DISK_file_test (filename))
-    load_message_store_entries(store, filename);
-
-  GNUNET_free(filename);
-
-  GNUNET_asprintf (&filename, "%s%s", directory, "links.store");
-
-  if (GNUNET_YES == GNUNET_DISK_file_test (filename))
-    load_message_store_links(store, filename);
-
-  GNUNET_free(filename);
-}
-
-struct GNUNET_MESSENGER_ClosureMessageSave
-{
-  struct GNUNET_MESSENGER_MessageStore *store;
-
-  struct GNUNET_DISK_FileHandle *storage;
-};
-
-static int
-iterate_save_entries (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_ClosureMessageSave *save = cls;
-  struct GNUNET_MESSENGER_MessageEntry *entry = value;
-
-  struct GNUNET_MESSENGER_MessageEntryStorage storage;
-
-  GNUNET_memcpy(&(storage.hash), key, sizeof(storage.hash));
-  GNUNET_memcpy(&(storage.entry), entry, sizeof(*entry));
-
-  GNUNET_DISK_file_write (save->storage, &storage, sizeof(storage));
-
-  return GNUNET_YES;
-}
-
-static int
-iterate_save_messages (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_ClosureMessageSave *save = cls;
-
-  if (GNUNET_NO != GNUNET_CONTAINER_multihashmap_contains (save->store->entries, key))
-    return GNUNET_YES;
-
-  struct GNUNET_MESSENGER_Message *message = value;
-  struct GNUNET_MESSENGER_MessageEntryStorage storage;
-
-  GNUNET_memcpy(&(storage.hash), key, sizeof(storage.hash));
-
-  storage.entry.length = get_message_size (message, GNUNET_YES);
-  storage.entry.offset = GNUNET_DISK_file_seek (save->store->storage_messages, 0, GNUNET_DISK_SEEK_END);
-
-  if ((GNUNET_SYSERR == storage.entry.offset) || (sizeof(storage)
-      != GNUNET_DISK_file_write (save->storage, &storage, sizeof(storage))))
-    return GNUNET_YES;
-
-  char *buffer = GNUNET_malloc(storage.entry.length);
-
-  encode_message (message, storage.entry.length, buffer, GNUNET_YES);
-
-  GNUNET_DISK_file_write (save->store->storage_messages, buffer, storage.entry.length);
-
-  GNUNET_free(buffer);
-
-  return GNUNET_YES;
-}
-
-static int
-iterate_save_links (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_ClosureMessageSave *save = cls;
-  struct GNUNET_MESSENGER_MessageLink *link = value;
-
-  GNUNET_DISK_file_write (save->storage, key, sizeof(*key));
-  GNUNET_DISK_file_write (save->storage, &(link->multiple), sizeof(link->multiple));
-  GNUNET_DISK_file_write (save->storage, &(link->first), sizeof(link->first));
-
-  if (GNUNET_YES == link->multiple)
-    GNUNET_DISK_file_write (save->storage, &(link->second), sizeof(link->second));
-
-  return GNUNET_YES;
-}
-
-void
-save_message_store (struct GNUNET_MESSENGER_MessageStore *store, const char *directory)
-{
-  GNUNET_assert((store) && (directory));
-
-  struct GNUNET_MESSENGER_ClosureMessageSave save;
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  char *filename;
-
-  if (GNUNET_YES != store->write_links)
-    goto save_entries;
-
-  GNUNET_asprintf (&filename, "%s%s", directory, "links.store");
-
-  save.store = store;
-  save.storage = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE, permission);
-
-  GNUNET_free(filename);
-
-  if (!save.storage)
-    goto save_entries;
-
-  if (GNUNET_SYSERR == GNUNET_DISK_file_seek (save.storage, 0, GNUNET_DISK_SEEK_SET))
-    goto close_links;
-
-  GNUNET_CONTAINER_multihashmap_iterate (store->links, iterate_save_links, &save);
-  store->write_links = GNUNET_NO;
-
-close_links:
-  GNUNET_DISK_file_close (save.storage);
-
-save_entries:
-  GNUNET_asprintf (&filename, "%s%s", directory, "entries.store");
-
-  save.store = store;
-  save.storage = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE, permission);
-
-  GNUNET_free(filename);
-
-  if (!save.storage)
-    return;
-
-  if (GNUNET_YES == store->rewrite_entries)
-  {
-    if (GNUNET_SYSERR == GNUNET_DISK_file_seek (save.storage, 0, GNUNET_DISK_SEEK_SET))
-      goto close_entries;
-
-    GNUNET_CONTAINER_multihashmap_iterate (store->entries, iterate_save_entries, &save);
-    store->rewrite_entries = GNUNET_NO;
-  }
-  else if (GNUNET_SYSERR == GNUNET_DISK_file_seek (save.storage, 0, GNUNET_DISK_SEEK_END))
-    goto close_entries;
-
-  if (store->storage_messages)
-    GNUNET_DISK_file_close (store->storage_messages);
-
-  GNUNET_asprintf (&filename, "%s%s", directory, "messages.store");
-
-  store->storage_messages = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READWRITE | GNUNET_DISK_OPEN_CREATE,
-                                                   permission);
-
-  GNUNET_free(filename);
-
-  if (store->storage_messages)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (store->messages, iterate_save_messages, &save);
-
-    GNUNET_DISK_file_sync (store->storage_messages);
-    GNUNET_DISK_file_sync (save.storage);
-  }
-
-close_entries:
-  GNUNET_DISK_file_close (save.storage);
-}
-
-int
-contains_store_message (const struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((store) && (hash));
-
-  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (store->messages, hash))
-    return GNUNET_YES;
-
-  return GNUNET_CONTAINER_multihashmap_contains (store->entries, hash);
-}
-
-const struct GNUNET_MESSENGER_Message*
-get_store_message (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((store) && (hash));
-
-  struct GNUNET_MESSENGER_Message *message = GNUNET_CONTAINER_multihashmap_get (store->messages, hash);
-
-  if (message)
-    return message;
-
-  if (!store->storage_messages)
-    return NULL;
-
-  const struct GNUNET_MESSENGER_MessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (store->entries, hash);
-
-  if (!entry)
-    return NULL;
-
-  if (entry->offset != GNUNET_DISK_file_seek (store->storage_messages, entry->offset, GNUNET_DISK_SEEK_SET))
-    return message;
-
-  char *buffer = GNUNET_malloc(entry->length);
-
-  if (!buffer)
-    return NULL;
-
-  if ((GNUNET_DISK_file_read (store->storage_messages, buffer, entry->length) != entry->length) ||
-      (entry->length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN)))
-    goto free_buffer;
-
-  message = create_message (GNUNET_MESSENGER_KIND_UNKNOWN);
-
-  const int decoding = decode_message (message, entry->length, buffer, GNUNET_YES, NULL);
-
-  struct GNUNET_HashCode check;
-  hash_message (message, entry->length, buffer, &check);
-
-  if ((GNUNET_YES != decoding) || (GNUNET_CRYPTO_hash_cmp (hash, &check) != 0))
-  {
-    if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (store->entries, hash, entry))
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Corrupted entry could not be removed from store: %s\n",
-                 GNUNET_h2s(hash));
-
-    store->rewrite_entries = GNUNET_YES;
-
-    goto free_message;
-  }
-
-  if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (store->messages, hash, message,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    goto free_buffer;
-
-free_message: destroy_message (message);
-  message = NULL;
-
-free_buffer:
-  GNUNET_free(buffer);
-
-  return message;
-}
-
-const struct GNUNET_MESSENGER_MessageLink*
-get_store_message_link (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash,
-                        int deleted_only)
-{
-  if (deleted_only)
-    goto get_link;
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message(store, hash);
-
-  if (!message)
-    goto get_link;
-
-  static struct GNUNET_MESSENGER_MessageLink link;
-
-  GNUNET_memcpy(&(link.first), &(message->header.previous), sizeof(link.first));
-
-  link.multiple = GNUNET_MESSENGER_KIND_MERGE == message->header.kind? GNUNET_YES : GNUNET_NO;
-
-  if (GNUNET_YES == link.multiple)
-    GNUNET_memcpy(&(link.second), &(message->body.merge.previous), sizeof(link.second));
-  else
-    GNUNET_memcpy(&(link.second), &(message->header.previous), sizeof(link.second));
-
-  return &link;
-
-get_link:
-  return GNUNET_CONTAINER_multihashmap_get (store->links, hash);
-}
-
-int
-put_store_message (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash,
-                   struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert((store) && (hash) && (message));
-
-  return GNUNET_CONTAINER_multihashmap_put (store->messages, hash, message,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
-}
-
-static void
-add_link (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash,
-          const struct GNUNET_MESSENGER_Message *message)
-{
-  struct GNUNET_MESSENGER_MessageLink *link = GNUNET_new(struct GNUNET_MESSENGER_MessageLink);
-
-  GNUNET_memcpy(&(link->first), &(message->header.previous), sizeof(link->first));
-
-  link->multiple = GNUNET_MESSENGER_KIND_MERGE == message->header.kind? GNUNET_YES : GNUNET_NO;
-
-  if (GNUNET_YES == link->multiple)
-    GNUNET_memcpy(&(link->second), &(message->body.merge.previous), sizeof(link->second));
-  else
-    GNUNET_memcpy(&(link->second), &(message->header.previous), sizeof(link->second));
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(store->links, hash, link,
-                                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    GNUNET_free(link);
-}
-
-int
-delete_store_message (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((store) && (hash));
-
-  const struct GNUNET_MESSENGER_MessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (store->entries, hash);
-
-  if (!entry)
-    goto clear_memory;
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message(store, hash);
-
-  if (message)
-    add_link (store, hash, message);
-
-  if (!store->storage_messages)
-    goto clear_entry;
-
-  if (entry->offset != GNUNET_DISK_file_seek (store->storage_messages, entry->offset, GNUNET_DISK_SEEK_SET))
-    return GNUNET_SYSERR;
-
-  char *clear_buffer = GNUNET_malloc(entry->length);
-
-  if (!clear_buffer)
-    return GNUNET_SYSERR;
-
-  GNUNET_CRYPTO_zero_keys (clear_buffer, entry->length);
-
-  if ((entry->length != GNUNET_DISK_file_write (store->storage_messages, clear_buffer, entry->length)) || (GNUNET_OK
-      != GNUNET_DISK_file_sync (store->storage_messages)))
-  {
-    GNUNET_free(clear_buffer);
-    return GNUNET_SYSERR;
-  }
-
-  GNUNET_free(clear_buffer);
-
-clear_entry:
-  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (store->entries, hash, entry))
-    store->rewrite_entries = GNUNET_YES;
-
-clear_memory:
-  GNUNET_CONTAINER_multihashmap_remove_all (store->messages, hash);
-  return GNUNET_OK;
-}
diff --git a/src/messenger/gnunet-service-messenger_message_store.h b/src/messenger/gnunet-service-messenger_message_store.h
deleted file mode 100644
index 87305826a..000000000
--- a/src/messenger/gnunet-service-messenger_message_store.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_message_store.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
-#define GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
-
-#include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
-
-struct GNUNET_MESSENGER_MessageEntry
-{
-  off_t offset;
-  uint16_t length;
-};
-
-struct GNUNET_MESSENGER_Message;
-
-struct GNUNET_MESSENGER_MessageLink
-{
-  uint8_t multiple;
-
-  struct GNUNET_HashCode first;
-  struct GNUNET_HashCode second;
-};
-
-struct GNUNET_MESSENGER_MessageStore
-{
-  struct GNUNET_DISK_FileHandle *storage_messages;
-
-  struct GNUNET_CONTAINER_MultiHashMap *entries;
-  struct GNUNET_CONTAINER_MultiHashMap *messages;
-  struct GNUNET_CONTAINER_MultiHashMap *links;
-
-  int rewrite_entries;
-  int write_links;
-};
-
-/**
- * Initializes a message <i>store</i> as fully empty.
- *
- * @param[out] store Message store
- */
-void
-init_message_store (struct GNUNET_MESSENGER_MessageStore *store);
-
-/**
- * Clears a message <i>store</i>, wipes its content and deallocates its memory.
- *
- * @param[in/out] store Message store
- */
-void
-clear_message_store (struct GNUNET_MESSENGER_MessageStore *store);
-
-/**
- * Loads messages from a <i>directory</i> into a message <i>store</i>.
- *
- * @param[out] store Message store
- * @param[in] directory Path to a directory
- */
-void
-load_message_store (struct GNUNET_MESSENGER_MessageStore *store, const char *directory);
-
-/**
- * Saves messages from a message <i>store</i> into a <i>directory</i>.
- *
- * @param[in] store Message store
- * @param[in] directory Path to a directory
- */
-void
-save_message_store (struct GNUNET_MESSENGER_MessageStore *store, const char *directory);
-
-/**
- * Checks if a message matching a given <i>hash</i> is stored in a message <i>store</i>.
- * The function returns #GNUNET_YES if a match is found, #GNUNET_NO otherwise.
- *
- * The message has not to be loaded from disk into memory for this check!
- *
- * @param[in] store Message store
- * @param[in] hash Hash of message
- * @return #GNUNET_YES on match, otherwise #GNUNET_NO
- */
-int
-contains_store_message (const struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash);
-
-/**
- * Returns the message from a message <i>store</i> matching a given <i>hash</i>. If no matching
- * message is found, NULL gets returned.
- *
- * This function requires the message to be loaded into memory!
- * @see contains_store_message()
- *
- * @param[in/out] store Message store
- * @param[in] hash Hash of message
- * @return Message or NULL
- */
-const struct GNUNET_MESSENGER_Message*
-get_store_message (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash);
-
-/**
- * Returns the message link from a message <i>store</i> matching a given <i>hash</i>. If the
- * flag is set to #GNUNET_YES, only links from deleted messages will be returned or NULL.
- *
- * Otherwise message links will also returned for messages found in the store under the given
- * hash. The link which will be returned copies link information from the message for
- * temporary usage.
- *
- * @param[in/out] store Message store
- * @param[in] hash Hash of message
- * @param[in] deleted_only Flag
- * @return Message link or NULL
- */
-const struct GNUNET_MESSENGER_MessageLink*
-get_store_message_link (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash,
-                        int deleted_only);
-
-/**
- * Stores a message into the message store. The result indicates if the operation was successful.
- *
- * @param[in/out] store Message store
- * @param[in] hash Hash of message
- * @param[in/out] message Message
- * @return #GNUNET_OK on success, otherwise #GNUNET_NO
- */
-int
-put_store_message (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash,
-                   struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Deletes a message in the message store. It will be removed from disk space and memory. The result
- * indicates if the operation was successful.
- *
- * @param[in/out] store Message store
- * @param[in] hash Hash of message
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
-int
-delete_store_message (struct GNUNET_MESSENGER_MessageStore *store, const struct GNUNET_HashCode *hash);
-
-#endif //GNUNET_SERVICE_MESSENGER_MESSAGE_STORE_H
diff --git a/src/messenger/gnunet-service-messenger_operation.c b/src/messenger/gnunet-service-messenger_operation.c
deleted file mode 100644
index d0c378699..000000000
--- a/src/messenger/gnunet-service-messenger_operation.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_operation.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_operation.h"
-
-#include "gnunet-service-messenger_operation_store.h"
-
-struct GNUNET_MESSENGER_Operation*
-create_operation (const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert(hash);
-
-  struct GNUNET_MESSENGER_Operation *op = GNUNET_new(struct GNUNET_MESSENGER_Operation);
-
-  op->type = GNUNET_MESSENGER_OP_UNKNOWN;
-  GNUNET_memcpy(&(op->hash), hash, sizeof(*hash));
-  op->timestamp = GNUNET_TIME_absolute_get_zero_();
-  op->store = NULL;
-  op->task = NULL;
-
-  return op;
-}
-
-void
-destroy_operation (struct GNUNET_MESSENGER_Operation *op)
-{
-  GNUNET_assert(op);
-
-  if (op->task)
-    GNUNET_SCHEDULER_cancel(op->task);
-
-  GNUNET_free(op);
-}
-
-static void
-callback_operation (void *cls);
-
-struct GNUNET_MESSENGER_Operation*
-load_operation (struct GNUNET_MESSENGER_OperationStore *store, const char *path)
-{
-  GNUNET_assert((store) && (path));
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-  struct GNUNET_MESSENGER_Operation* op = NULL;
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_parse(cfg, path))
-    goto destroy_config;
-
-  struct GNUNET_HashCode hash;
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_data (cfg, "operation", "hash", &hash, sizeof(hash)))
-    goto destroy_config;
-
-  op = create_operation(&hash);
-
-  unsigned long long type_number;
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number(cfg, "operation", "type", &type_number))
-    switch (type_number)
-    {
-    case GNUNET_MESSENGER_OP_REQUEST:
-      op->type = GNUNET_MESSENGER_OP_REQUEST;
-      break;
-    case GNUNET_MESSENGER_OP_DELETE:
-      op->type = GNUNET_MESSENGER_OP_DELETE;
-      break;
-    case GNUNET_MESSENGER_OP_MERGE:
-      op->type = GNUNET_MESSENGER_OP_MERGE;
-      break;
-    default:
-      break;
-    }
-
-  if ((GNUNET_MESSENGER_OP_UNKNOWN == op->type) ||
-      (GNUNET_OK != GNUNET_CONFIGURATION_get_data (cfg, "operation", "timestamp", &(op->timestamp), sizeof(op->timestamp))))
-  {
-    destroy_operation(op);
-    op = NULL;
-    goto destroy_config;
-  }
-
-  const struct GNUNET_TIME_Relative delay = GNUNET_TIME_absolute_get_remaining(op->timestamp);
-
-  op->task = GNUNET_SCHEDULER_add_delayed_with_priority(
-      delay,
-      GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
-      callback_operation,
-      op
-  );
-
-  op->store = store;
-
-destroy_config:
-  GNUNET_CONFIGURATION_destroy (cfg);
-
-  return op;
-}
-
-void
-save_operation (const struct GNUNET_MESSENGER_Operation *op, const char *path)
-{
-  GNUNET_assert((path) && (op));
-
-  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
-
-  char *hash_data;
-  hash_data = GNUNET_STRINGS_data_to_string_alloc (&(op->hash), sizeof(op->hash));
-
-  if (hash_data)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg, "operation", "hash", hash_data);
-
-    GNUNET_free(hash_data);
-  }
-
-  GNUNET_CONFIGURATION_set_value_number(cfg, "operation", "type", op->type);
-
-  char *timestamp_data;
-  timestamp_data = GNUNET_STRINGS_data_to_string_alloc (&(op->timestamp), sizeof(op->timestamp));
-
-  if (timestamp_data)
-  {
-    GNUNET_CONFIGURATION_set_value_string (cfg, "operation", "timestamp", timestamp_data);
-
-    GNUNET_free(timestamp_data);
-  }
-
-  GNUNET_CONFIGURATION_write (cfg, path);
-  GNUNET_CONFIGURATION_destroy (cfg);
-}
-
-extern void
-callback_store_operation (struct GNUNET_MESSENGER_OperationStore *store,
-                          enum GNUNET_MESSENGER_OperationType type,
-                          const struct GNUNET_HashCode *hash);
-
-static void
-callback_operation (void *cls)
-{
-  struct GNUNET_MESSENGER_Operation *op = cls;
-
-  op->task = NULL;
-
-  callback_store_operation (op->store, op->type, &(op->hash));
-}
-
-int
-start_operation (struct GNUNET_MESSENGER_Operation *op,
-                 enum GNUNET_MESSENGER_OperationType type,
-                 struct GNUNET_MESSENGER_OperationStore *store,
-                 struct GNUNET_TIME_Relative delay)
-{
-  GNUNET_assert((op) && (store));
-
-  if (op->task)
-    return GNUNET_SYSERR;
-
-  const struct GNUNET_TIME_Absolute timestamp = GNUNET_TIME_absolute_add(
-      GNUNET_TIME_absolute_get(),
-      delay
-  );
-
-  op->task = GNUNET_SCHEDULER_add_delayed_with_priority(
-      delay,
-      GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
-      callback_operation,
-      op
-  );
-
-  op->type = type;
-  op->timestamp = timestamp;
-  op->store = store;
-
-  return GNUNET_OK;
-}
-
-int
-stop_operation (struct GNUNET_MESSENGER_Operation *op)
-{
-  GNUNET_assert(op);
-
-  if (!op->task)
-    return GNUNET_SYSERR;
-
-  GNUNET_SCHEDULER_cancel(op->task);
-  op->task = NULL;
-
-  op->type = GNUNET_MESSENGER_OP_UNKNOWN;
-  op->timestamp = GNUNET_TIME_absolute_get_zero_();
-  op->store = NULL;
-
-  return GNUNET_OK;
-}
diff --git a/src/messenger/gnunet-service-messenger_operation.h b/src/messenger/gnunet-service-messenger_operation.h
deleted file mode 100644
index f1e06f4a7..000000000
--- a/src/messenger/gnunet-service-messenger_operation.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_operation.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_OPERATION_H
-#define GNUNET_SERVICE_MESSENGER_OPERATION_H
-
-#include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_time_lib.h"
-
-enum GNUNET_MESSENGER_OperationType
-{
-  GNUNET_MESSENGER_OP_REQUEST = 1,
-  GNUNET_MESSENGER_OP_DELETE = 2,
-  GNUNET_MESSENGER_OP_MERGE = 3,
-
-  GNUNET_MESSENGER_OP_UNKNOWN = 0
-};
-
-struct GNUNET_MESSENGER_OperationStore;
-
-struct GNUNET_MESSENGER_Operation
-{
-  enum GNUNET_MESSENGER_OperationType type;
-
-  struct GNUNET_HashCode hash;
-  struct GNUNET_TIME_Absolute timestamp;
-
-  struct GNUNET_MESSENGER_OperationStore *store;
-  struct GNUNET_SCHEDULER_Task* task;
-};
-
-/**
- * Creates and allocates a new operation under a given <i>hash</i>.
- *
- * @param[in] hash Hash of message
- */
-struct GNUNET_MESSENGER_Operation*
-create_operation (const struct GNUNET_HashCode *hash);
-
-/**
- * Destroys an operation and frees its memory fully.
- *
- * @param[in/out] op Operation
- */
-void
-destroy_operation (struct GNUNET_MESSENGER_Operation *op);
-
-/**
- * Loads data from a configuration file at a selected <i>path</i> into
- * a new allocated and created operation for a specific operation
- * <i>store</i> if the required information could be read successfully.
- *
- * The method will return the new operation and it will be started
- * automatically to match its timestamp of execution.
- *
- * If the method fails to restore any valid operation from the file,
- * NULL gets returned instead.
- *
- * @param[in/out] store Operation store
- * @param[in] path Path of a configuration file
- */
-struct GNUNET_MESSENGER_Operation*
-load_operation (struct GNUNET_MESSENGER_OperationStore *store, const char *path);
-
-/**
- * Saves data from an <i>operation</i> into a configuration file at a
- * selected <i>path</i> which can be load to restore the operation
- * completely and continue its process.
- *
- * @param[in] op Operation
- * @param[in] path Path of a configuration file
- */
-void
-save_operation (const struct GNUNET_MESSENGER_Operation *op, const char *path);
-
-/**
- * Starts an inactive operation with a given <i>delay</i> in a
- * specific operation <i>store</i>. The method will replace the
- * operations type to process it correctly. An operation can't be
- * started twice, it has to be stopped or fully processed first.
- *
- * @param[in/out] op Operation
- * @param[in] type Type of operation
- * @param[in/out] store Operation store
- * @param[in] delay Delay
- * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
- */
-int
-start_operation (struct GNUNET_MESSENGER_Operation *op,
-                 enum GNUNET_MESSENGER_OperationType type,
-                 struct GNUNET_MESSENGER_OperationStore *store,
-                 struct GNUNET_TIME_Relative delay);
-
-/**
- * Stops an active operation and resets its type to be
- * #GNUNET_MESSENGER_OP_UNKNOWN.
- *
- * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
- */
-int
-stop_operation (struct GNUNET_MESSENGER_Operation *op);
-
-#endif //GNUNET_SERVICE_MESSENGER_OPERATION_H
diff --git a/src/messenger/gnunet-service-messenger_operation_store.c b/src/messenger/gnunet-service-messenger_operation_store.c
deleted file mode 100644
index a32fbad2c..000000000
--- a/src/messenger/gnunet-service-messenger_operation_store.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_operation_store.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_operation_store.h"
-
-#include "gnunet-service-messenger_operation.h"
-#include "gnunet-service-messenger_room.h"
-
-void
-init_operation_store (struct GNUNET_MESSENGER_OperationStore *store, struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert((store) && (room));
-
-  store->room = room;
-  store->operations = GNUNET_CONTAINER_multihashmap_create(8, GNUNET_NO);
-}
-
-static int
-iterate_destroy_operations (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Operation *op = value;
-
-  destroy_operation(op);
-
-  return GNUNET_YES;
-}
-
-void
-clear_operation_store (struct GNUNET_MESSENGER_OperationStore *store)
-{
-  GNUNET_assert(store);
-
-  GNUNET_CONTAINER_multihashmap_iterate (store->operations, iterate_destroy_operations, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy(store->operations);
-}
-
-static int
-callback_scan_for_operations (void *cls, const char *filename)
-{
-  struct GNUNET_MESSENGER_OperationStore *store = cls;
-
-  if (GNUNET_YES == GNUNET_DISK_file_test (filename))
-  {
-    char *path;
-
-    GNUNET_asprintf (&path, "%s%c", filename, DIR_SEPARATOR);
-
-    struct GNUNET_MESSENGER_Operation *op = load_operation(store, path);
-
-    if ((op) && (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(
-        store->operations,
-        &(op->hash), op,
-        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
-    {
-      destroy_operation(op);
-    }
-
-    GNUNET_free(path);
-  }
-
-  return GNUNET_OK;
-}
-
-void
-load_operation_store (struct GNUNET_MESSENGER_OperationStore *store,
-                      const char *directory)
-{
-  GNUNET_assert ((store) && (directory));
-
-  if (GNUNET_OK == GNUNET_DISK_directory_test (directory, GNUNET_YES))
-    GNUNET_DISK_directory_scan (directory, callback_scan_for_operations, store);
-}
-
-static int
-iterate_save_operations (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  const char *save_dir = cls;
-
-  struct GNUNET_MESSENGER_Operation *op = value;
-
-  if (!op)
-    return GNUNET_YES;
-
-  char *op_dir;
-  GNUNET_asprintf (&op_dir, "%s%s.cfg", save_dir, GNUNET_h2s(key));
-  save_operation(op, op_dir);
-
-  GNUNET_free(op_dir);
-  return GNUNET_YES;
-}
-
-void
-save_operation_store (const struct GNUNET_MESSENGER_OperationStore *store,
-                      const char *directory)
-{
-  GNUNET_assert ((store) && (directory));
-
-  char* save_dir;
-  GNUNET_asprintf (&save_dir, "%s%s%c", directory, "operations", DIR_SEPARATOR);
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
-      (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
-    GNUNET_CONTAINER_multihashmap_iterate (store->operations, iterate_save_operations, save_dir);
-
-  GNUNET_free(save_dir);
-}
-
-enum GNUNET_MESSENGER_OperationType
-get_store_operation_type (const struct GNUNET_MESSENGER_OperationStore *store,
-                          const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((store) && (hash));
-
-  struct GNUNET_MESSENGER_Operation *op = GNUNET_CONTAINER_multihashmap_get(store->operations, hash);
-
-  if (!op)
-    return GNUNET_MESSENGER_OP_UNKNOWN;
-
-  return op->type;
-}
-
-int
-use_store_operation (struct GNUNET_MESSENGER_OperationStore *store,
-                     const struct GNUNET_HashCode *hash,
-                     enum GNUNET_MESSENGER_OperationType type,
-                     struct GNUNET_TIME_Relative delay)
-{
-  GNUNET_assert((store) && (hash));
-
-  struct GNUNET_MESSENGER_Operation *op = GNUNET_CONTAINER_multihashmap_get(store->operations, hash);
-
-  if (op)
-    goto use_op;
-
-  op = create_operation(hash);
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(store->operations, hash, op, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-  {
-    destroy_operation(op);
-
-    return GNUNET_SYSERR;
-  }
-
-use_op:
-  if ((op->type != GNUNET_MESSENGER_OP_UNKNOWN) &&
-      (type == GNUNET_MESSENGER_OP_DELETE))
-    stop_operation (op);
-
-  return start_operation(op, type, store, delay);
-}
-
-void
-cancel_store_operation (struct GNUNET_MESSENGER_OperationStore *store,
-                        const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((store) && (hash));
-
-  struct GNUNET_MESSENGER_Operation *op = GNUNET_CONTAINER_multihashmap_get(store->operations, hash);
-
-  if (!op)
-    return;
-
-  stop_operation(op);
-
-  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove(store->operations, hash, op))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Canceled operation could not be removed: %s\n",
-               GNUNET_h2s(hash));
-
-  destroy_operation(op);
-}
-
-extern void
-callback_room_deletion (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash);
-
-extern void
-callback_room_merge (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash);
-
-void
-callback_store_operation (struct GNUNET_MESSENGER_OperationStore *store,
-                          enum GNUNET_MESSENGER_OperationType type,
-                          const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((store) && (hash));
-
-  struct GNUNET_HashCode op_hash;
-  GNUNET_memcpy(&op_hash, hash, sizeof(op_hash));
-  cancel_store_operation (store, &op_hash);
-
-  struct GNUNET_MESSENGER_SrvRoom *room = store->room;
-
-  switch (type)
-  {
-  case GNUNET_MESSENGER_OP_REQUEST:
-    break;
-  case GNUNET_MESSENGER_OP_DELETE:
-    callback_room_deletion (room, &op_hash);
-    break;
-  case GNUNET_MESSENGER_OP_MERGE:
-    callback_room_merge (room, &op_hash);
-    break;
-  default:
-    break;
-  }
-}
diff --git a/src/messenger/gnunet-service-messenger_operation_store.h b/src/messenger/gnunet-service-messenger_operation_store.h
deleted file mode 100644
index 4c613437c..000000000
--- a/src/messenger/gnunet-service-messenger_operation_store.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_operation_store.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
-#define GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
-
-#include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
-
-struct GNUNET_MESSENGER_SrvRoom;
-
-struct GNUNET_MESSENGER_OperationStore
-{
-  struct GNUNET_MESSENGER_SrvRoom *room;
-
-  struct GNUNET_CONTAINER_MultiHashMap *operations;
-};
-
-/**
- * Initializes an operation <i>store</i> as fully empty with a given <i>room</i>.
- *
- * @param[out] store Operation store
- * @param[in/out] room Room
- */
-void
-init_operation_store (struct GNUNET_MESSENGER_OperationStore *store, struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Clears an operation <i>store</i>, stops all operations and deallocates its memory.
- *
- * @param[in/out] store Operation store
- */
-void
-clear_operation_store (struct GNUNET_MESSENGER_OperationStore *store);
-
-/**
- * Loads operations from a <i>directory</i> into an operation <i>store</i>.
- *
- * @param[out] store Operation store
- * @param[in] directory Path to a directory
- */
-void
-load_operation_store (struct GNUNET_MESSENGER_OperationStore *store,
-                      const char *directory);
-
-/**
- * Saves operations from an operation <i>store</i> into a <i>directory</i>.
- *
- * @param[in] store Operation store
- * @param[in] directory Path to a directory
- */
-void
-save_operation_store (const struct GNUNET_MESSENGER_OperationStore *store,
-                      const char *directory);
-
-/**
- * Returns the type of the active operation under a given <i>hash</i> in
- * a specific operation <i>store</i>. If there is no active operation under
- * the given <i>hash</i>, #GNUNET_MESSENGER_OP_UNKNOWN gets returned instead.
- *
- * @param[in] store Operation store
- * @param[in] hash Hash of message
- * @return Type of operation or #GNUNET_MESSENGER_OP_UNKNOWN
- */
-enum GNUNET_MESSENGER_OperationType
-get_store_operation_type (const struct GNUNET_MESSENGER_OperationStore *store,
-                          const struct GNUNET_HashCode *hash);
-
-/**
- * Tries to use an operation under a given <i>hash</i> in a specific
- * operation <i>store</i>. The operation will use the selected <i>type</i>
- * if successful. The operation will be delayed by a given <i>delay</i>.
- *
- * If the selected type is #GNUNET_MESSENGER_OP_DELETE any active operation
- * under the given hash will be stopped and replaced.
- *
- * If the new operation could be started successfully the method returns
- * #GNUNET_OK, otherwise #GNUNET_SYSERR.
- *
- * @param[in/out] store Operation store
- * @param[in] hash Hash of message
- * @param[in] type Operation type
- * @param[in] delay Delay
- * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
- */
-int
-use_store_operation (struct GNUNET_MESSENGER_OperationStore *store,
-                     const struct GNUNET_HashCode *hash,
-                     enum GNUNET_MESSENGER_OperationType type,
-                     struct GNUNET_TIME_Relative delay);
-
-/**
- * Stops any active operation under a given <i>hash</i> in a specific
- * operation <i>store</i>.
- *
- * Beware that calling this method will also implicitly free the memory
- * of any active operation under the given hash!
- *
- * @param[in/out] store Operation store
- * @param[in] hash Hash of message
- */
-void
-cancel_store_operation (struct GNUNET_MESSENGER_OperationStore *store,
-                        const struct GNUNET_HashCode *hash);
-
-#endif //GNUNET_SERVICE_MESSENGER_OPERATION_STORE_H
diff --git a/src/messenger/gnunet-service-messenger_room.c b/src/messenger/gnunet-service-messenger_room.c
deleted file mode 100644
index 73e94908f..000000000
--- a/src/messenger/gnunet-service-messenger_room.c
+++ /dev/null
@@ -1,1210 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_room.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_room.h"
-
-#include "gnunet-service-messenger_member.h"
-#include "gnunet-service-messenger_member_session.h"
-
-#include "gnunet-service-messenger_message_kind.h"
-#include "gnunet-service-messenger_message_handle.h"
-#include "gnunet-service-messenger_message_send.h"
-
-#include "gnunet-service-messenger_operation.h"
-
-#include "gnunet-service-messenger.h"
-#include "gnunet-service-messenger_service.h"
-#include "gnunet-service-messenger_tunnel.h"
-#include "messenger_api_util.h"
-
-static void
-idle_request_room_messages (void *cls);
-
-struct GNUNET_MESSENGER_SrvRoom*
-create_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  struct GNUNET_MESSENGER_SrvRoom *room = GNUNET_new(struct GNUNET_MESSENGER_SrvRoom);
-
-  room->service = handle->service;
-  room->host = handle;
-  room->port = NULL;
-
-  GNUNET_memcpy(&(room->key), key, sizeof(struct GNUNET_HashCode));
-
-  room->tunnels = GNUNET_CONTAINER_multipeermap_create (8, GNUNET_NO);
-
-  init_member_store(get_room_member_store(room), room);
-  init_message_store (get_room_message_store(room));
-  init_operation_store(get_room_operation_store(room), room);
-
-  init_list_tunnels (&(room->basement));
-  init_message_state(&(room->state));
-
-  room->peer_message = NULL;
-
-  init_list_messages (&(room->handling));
-  room->idle = NULL;
-
-  if (room->service->dir)
-    load_room (room);
-
-  room->idle = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, idle_request_room_messages, room);
-
-  return room;
-}
-
-static int
-iterate_destroy_tunnels (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = value;
-  destroy_tunnel (tunnel);
-  return GNUNET_YES;
-}
-
-static void
-handle_room_messages (struct GNUNET_MESSENGER_SrvRoom *room);
-
-void
-destroy_room (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  if (room->idle)
-  {
-    GNUNET_SCHEDULER_cancel (room->idle);
-
-    room->idle = NULL;
-  }
-
-  if (room->port)
-    GNUNET_CADET_close_port (room->port);
-
-  GNUNET_CONTAINER_multipeermap_iterate (room->tunnels, iterate_destroy_tunnels, NULL);
-
-  handle_room_messages (room);
-
-  if (room->service->dir)
-    save_room (room);
-
-  clear_member_store (get_room_member_store(room));
-  clear_message_store (get_room_message_store(room));
-  clear_operation_store(get_room_operation_store(room));
-
-  GNUNET_CONTAINER_multipeermap_destroy (room->tunnels);
-
-  clear_list_tunnels (&(room->basement));
-  clear_message_state(&(room->state));
-
-  if (room->peer_message)
-    GNUNET_free(room->peer_message);
-
-  GNUNET_free(room);
-}
-
-struct GNUNET_MESSENGER_MemberStore*
-get_room_member_store (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  return &(room->member_store);
-}
-
-struct GNUNET_MESSENGER_MessageStore*
-get_room_message_store (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  return &(room->message_store);
-}
-
-struct GNUNET_MESSENGER_OperationStore*
-get_room_operation_store (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  return &(room->operation_store);
-}
-
-static int
-send_room_info (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  if ((!handle) || (!is_tunnel_connected (tunnel)))
-    return GNUNET_NO;
-
-  return send_tunnel_message (tunnel, handle, create_message_info (get_handle_ego (handle)));
-}
-
-static void*
-callback_room_connect (void *cls, struct GNUNET_CADET_Channel *channel, const struct GNUNET_PeerIdentity *source)
-{
-  struct GNUNET_MESSENGER_SrvRoom *room = cls;
-
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = create_tunnel (room, source);
-
-  if ((tunnel) &&
-      (GNUNET_OK != GNUNET_CONTAINER_multipeermap_put (room->tunnels, source, tunnel,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
-  {
-    destroy_tunnel (tunnel);
-    tunnel = NULL;
-  }
-
-  if (!tunnel)
-  {
-    delayed_disconnect_channel (channel);
-    return NULL;
-  }
-
-  bind_tunnel(tunnel, channel);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "New tunnel in room (%s) established to peer: %s\n",
-             GNUNET_h2s(get_room_key(room)), GNUNET_i2s (source));
-
-  if (GNUNET_YES == send_room_info (room, room->host, tunnel))
-    return tunnel;
-
-  disconnect_tunnel (tunnel);
-
-  if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (room->tunnels, source, tunnel))
-    destroy_tunnel (tunnel);
-
-  return NULL;
-}
-
-static int
-join_room (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-           struct GNUNET_MESSENGER_Member *member)
-{
-  GNUNET_assert((room) && (handle) && (member));
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Joining room: %s (%s)\n", GNUNET_h2s (get_room_key (room)),
-             GNUNET_sh2s (get_member_id(member)));
-
-  if (GNUNET_OK != change_handle_member_id (handle, get_room_key(room), get_member_id(member)))
-    return GNUNET_NO;
-
-  struct GNUNET_MESSENGER_Message *message = create_message_join (get_handle_ego (handle));
-
-  if (!message)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Your join message could not be created!\n");
-
-    return GNUNET_NO;
-  }
-
-  return send_room_message (room, handle, message);
-}
-
-struct GNUNET_MESSENGER_MemberNotify
-{
-  struct GNUNET_MESSENGER_SrvRoom *room;
-  struct GNUNET_MESSENGER_SrvHandle *handle;
-  struct GNUNET_MESSENGER_MemberSession *session;
-};
-
-static void
-notify_about_members (struct GNUNET_MESSENGER_MemberNotify *notify, struct GNUNET_MESSENGER_MemberSession *session,
-                      struct GNUNET_CONTAINER_MultiHashMap *map, int check_permission)
-{
-  if (session->prev)
-    notify_about_members (notify, session->prev, map, GNUNET_YES);
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(notify->room);
-  struct GNUNET_MESSENGER_ListMessage *element;
-
-  for (element = session->messages.head; element; element = element->next)
-  {
-    if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(map, &(element->hash)))
-      continue;
-
-    if ((GNUNET_YES == check_permission) &&
-        (GNUNET_YES != check_member_session_history(notify->session, &(element->hash), GNUNET_NO)))
-      continue;
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put(map, &(element->hash), NULL,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Notification of session message could be duplicated!\n");
-
-    const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, &(element->hash));
-
-    if (message)
-      notify_handle_message (notify->handle, get_room_key(notify->room), session, message, &(element->hash));
-  }
-}
-
-static int
-iterate_notify_about_members (void *cls, const struct GNUNET_IDENTITY_PublicKey *public_key,
-                              struct GNUNET_MESSENGER_MemberSession *session)
-{
-  struct GNUNET_MESSENGER_MemberNotify *notify = cls;
-
-  if ((notify->session == session) || (GNUNET_YES == is_member_session_completed(session)))
-    return GNUNET_YES;
-
-  struct GNUNET_CONTAINER_MultiHashMap *map = GNUNET_CONTAINER_multihashmap_create(4, GNUNET_NO);
-
-  notify_about_members (notify, session, map, GNUNET_NO);
-
-  GNUNET_CONTAINER_multihashmap_destroy(map);
-  return GNUNET_YES;
-}
-
-static int
-join_room_locally (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  const struct GNUNET_ShortHashCode *member_id = get_handle_member_id (handle, get_room_key(room));
-
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = add_store_member(member_store, member_id);
-
-  if (GNUNET_NO == join_room (room, handle, member))
-    return GNUNET_NO;
-
-  const struct GNUNET_MESSENGER_Ego *ego = get_handle_ego(handle);
-  struct GNUNET_MESSENGER_MemberSession *session = get_member_session (member, &(ego->pub));
-
-  if (!session)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "A valid session is required to join a room!\n");
-    return GNUNET_NO;
-  }
-
-  struct GNUNET_MESSENGER_MemberNotify notify;
-
-  notify.room = room;
-  notify.handle = handle;
-  notify.session = session;
-
-  iterate_store_members(get_room_member_store(room), iterate_notify_about_members, &notify);
-
-  return GNUNET_YES;
-}
-
-extern int
-check_tunnel_message (void *cls, const struct GNUNET_MessageHeader *header);
-
-extern void
-handle_tunnel_message (void *cls, const struct GNUNET_MessageHeader *header);
-
-extern void
-callback_tunnel_disconnect (void *cls, const struct GNUNET_CADET_Channel *channel);
-
-int
-open_room (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert((room) && (handle));
-
-  if (room->port)
-    return join_room_locally (room, handle);
-
-  struct GNUNET_CADET_Handle *cadet = get_room_cadet (room);
-  const struct GNUNET_HashCode *key = get_room_key (room);
-
-  struct GNUNET_MQ_MessageHandler handlers[] = { GNUNET_MQ_hd_var_size(tunnel_message, GNUNET_MESSAGE_TYPE_CADET_CLI,
-                                                                       struct GNUNET_MessageHeader, NULL),
-                                                 GNUNET_MQ_handler_end() };
-
-  struct GNUNET_HashCode port;
-  convert_messenger_key_to_port(key, &port);
-  room->port = GNUNET_CADET_open_port (cadet, &port, callback_room_connect, room, NULL, callback_tunnel_disconnect,
-                                       handlers);
-
-  if (room->port)
-    GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Port of room (%s) was opened!\n",
-               GNUNET_h2s(get_room_key(room)));
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Port of room (%s) could not be opened!\n",
-               GNUNET_h2s(get_room_key(room)));
-
-  const struct GNUNET_ShortHashCode *member_id = get_handle_member_id (handle, get_room_key(room));
-
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member(member_store, member_id);
-
-  if (member)
-    goto exit_open_room;
-
-  member = add_store_member(member_store, member_id);
-
-  if ((GNUNET_NO == join_room (room, handle, member)) && (room->port))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "You could not join the room, therefore it keeps closed!\n");
-
-    GNUNET_CADET_close_port (room->port);
-    room->port = NULL;
-
-    return GNUNET_NO;
-  }
-
-exit_open_room:
-  return (room->port ? send_room_message (room, handle, create_message_peer (room->service)) : GNUNET_NO);
-}
-
-int
-enter_room_at (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-               const struct GNUNET_PeerIdentity *door)
-{
-  GNUNET_assert((room) && (handle) && (door));
-
-  struct GNUNET_PeerIdentity peer;
-
-  if ((GNUNET_OK == get_service_peer_identity (room->service, &peer)) &&
-      (0 == GNUNET_memcmp(&peer, door)))
-    return join_room_locally (room, handle);
-
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = GNUNET_CONTAINER_multipeermap_get (room->tunnels, door);
-
-  if (!tunnel)
-  {
-    tunnel = create_tunnel (room, door);
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multipeermap_put (room->tunnels, door, tunnel,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE))
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "You could not connect to that door!\n");
-      destroy_tunnel (tunnel);
-      return GNUNET_NO;
-    }
-  }
-
-  if (GNUNET_SYSERR == connect_tunnel (tunnel))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Connection failure during entrance!\n");
-    GNUNET_CONTAINER_multipeermap_remove (room->tunnels, door, tunnel);
-    destroy_tunnel (tunnel);
-    return GNUNET_NO;
-  }
-
-  return join_room_locally (room, handle);
-}
-
-struct GNUNET_MQ_Envelope*
-pack_room_message (const struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash, int mode)
-{
-  GNUNET_assert((room) && (handle) && (message) && (hash));
-
-  message->header.timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
-
-  const struct GNUNET_ShortHashCode *id = get_handle_member_id (handle, get_room_key(room));
-
-  GNUNET_assert(id);
-
-  GNUNET_memcpy(&(message->header.sender_id), id, sizeof(struct GNUNET_ShortHashCode));
-  get_message_state_chain_hash (&(room->state), &(message->header.previous));
-
-  return pack_message (message, hash, get_handle_ego (handle), mode);
-}
-
-struct GNUNET_MESSENGER_ClosureSendRoom
-{
-  struct GNUNET_MESSENGER_SrvRoom *room;
-  struct GNUNET_MESSENGER_SrvHandle *handle;
-  struct GNUNET_MESSENGER_SrvTunnel *exclude;
-  struct GNUNET_MESSENGER_Message *message;
-  struct GNUNET_HashCode *hash;
-  int packed;
-};
-
-static int
-iterate_send_room_message (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = value;
-
-  if ((!is_tunnel_connected (tunnel)) ||
-      (get_tunnel_messenger_version(tunnel) < GNUNET_MESSENGER_VERSION))
-    return GNUNET_YES;
-
-  struct GNUNET_MESSENGER_ClosureSendRoom *closure = cls;
-
-  if (tunnel == closure->exclude)
-    return GNUNET_YES;
-
-  struct GNUNET_MQ_Envelope *env = NULL;
-
-  if (closure->packed == GNUNET_NO)
-  {
-    env = pack_room_message (closure->room, closure->handle, closure->message, closure->hash,
-    GNUNET_MESSENGER_PACK_MODE_ENVELOPE);
-
-    if (env)
-      closure->packed = GNUNET_YES;
-  }
-  else
-    env = pack_message (closure->message, NULL, NULL, GNUNET_MESSENGER_PACK_MODE_ENVELOPE);
-
-  if (env)
-    send_tunnel_envelope (tunnel, env, closure->hash);
-
-  return GNUNET_YES;
-}
-
-int
-update_room_message (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-void
-callback_room_handle_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                              const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-int
-send_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert((room) && (handle));
-
-  if (!message)
-    return GNUNET_NO;
-
-  if (GNUNET_YES == is_message_session_bound(message))
-    merge_room_last_messages(room, handle);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Sending message from handle with member id: %s\n",
-             GNUNET_sh2s(get_handle_member_id(handle, get_room_key(room))));
-
-  struct GNUNET_HashCode hash;
-  struct GNUNET_MESSENGER_ClosureSendRoom closure;
-
-  closure.room = room;
-  closure.handle = handle;
-  closure.exclude = NULL;
-  closure.message = message;
-  closure.hash = &hash;
-  closure.packed = GNUNET_NO;
-
-  GNUNET_CONTAINER_multipeermap_iterate (room->tunnels, iterate_send_room_message, &closure);
-
-  if (GNUNET_NO == closure.packed)
-    pack_room_message (room, handle, message, &hash, GNUNET_MESSENGER_PACK_MODE_UNKNOWN);
-
-  const int new_message = update_room_message (room, message, &hash);
-
-  if (GNUNET_YES != new_message)
-    return GNUNET_SYSERR;
-
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_JOIN:
-    send_message_join (room, handle, message, &hash);
-    break;
-  case GNUNET_MESSENGER_KIND_PEER:
-    send_message_peer (room, handle, message, &hash);
-    break;
-  case GNUNET_MESSENGER_KIND_ID:
-    send_message_id (room, handle, message, &hash);
-    break;
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    send_message_request (room, handle, message, &hash);
-    break;
-  default:
-    break;
-  }
-
-  callback_room_handle_message (room, handle, message, &hash);
-  return GNUNET_YES;
-}
-
-void
-forward_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                      struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((room) && (tunnel));
-
-  if (!message)
-    return;
-
-  struct GNUNET_MESSENGER_ClosureSendRoom closure;
-  struct GNUNET_HashCode message_hash;
-
-  GNUNET_memcpy(&message_hash, hash, sizeof(struct GNUNET_HashCode));
-
-  closure.room = room;
-  closure.handle = NULL;
-  closure.exclude = tunnel;
-  closure.message = message;
-  closure.hash = &message_hash;
-  closure.packed = GNUNET_YES;
-
-  GNUNET_CONTAINER_multipeermap_iterate (room->tunnels, iterate_send_room_message, &closure);
-}
-
-void
-check_room_peer_status (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  if (!room->peer_message)
-    return;
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, room->peer_message);
-
-  if (!message)
-  {
-    GNUNET_free(room->peer_message);
-    room->peer_message = NULL;
-    return;
-  }
-
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member_of(member_store, message);
-
-  if (!member)
-    goto resend_peer_message;
-
-  struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of(member, message, room->peer_message);
-
-  if (GNUNET_YES == is_member_session_closed(session))
-    goto resend_peer_message;
-
-  if (tunnel)
-    forward_tunnel_message(tunnel, message, room->peer_message);
-
-  return;
-
-resend_peer_message:
-  if (room->host)
-    send_room_message (room, room->host, create_message_peer (room->service));
-}
-
-void
-merge_room_last_messages (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert(room);
-
-  if (!handle)
-    return;
-
-  const struct GNUNET_HashCode *hash;
-
-merge_next:
-  hash = get_message_state_merge_hash (&(room->state));
-
-  if (!hash)
-    return;
-
-  send_room_message (room, handle, create_message_merge (hash));
-  goto merge_next;
-}
-
-void
-callback_room_deletion (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash)
-{
-  if (GNUNET_OK != delete_store_message (get_room_message_store(room), hash))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Deletion of message failed! (%s)\n", GNUNET_h2s(hash));
-    return;
-  }
-}
-
-void
-callback_room_merge (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash)
-{
-  if (!room->host)
-    return;
-
-  send_room_message (room, room->host, create_message_merge (hash));
-}
-
-int
-delete_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_HashCode *hash, const struct GNUNET_TIME_Relative delay)
-{
-  GNUNET_assert((room) && (session) && (hash));
-
-  const struct GNUNET_TIME_Relative forever = GNUNET_TIME_relative_get_forever_ ();
-
-  if (0 == GNUNET_memcmp(&forever, &delay))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Deletion is delayed forever: operation is impossible!\n");
-    return GNUNET_SYSERR;
-  }
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, hash);
-
-  if (!message)
-    return GNUNET_YES;
-
-  if (GNUNET_YES != check_member_session_history(session, hash, GNUNET_YES))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Unpermitted request for deletion by member (%s) of message (%s)!\n",
-               GNUNET_sh2s(get_member_session_id(session)), GNUNET_h2s(hash));
-
-    return GNUNET_NO;
-  }
-
-  struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(room);
-
-  if (GNUNET_OK != use_store_operation(operation_store, hash, GNUNET_MESSENGER_OP_DELETE, delay))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Deletion has failed: operation denied!\n");
-    return GNUNET_SYSERR;
-  }
-
-  return GNUNET_YES;
-}
-
-struct GNUNET_CADET_Handle*
-get_room_cadet (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  return room->service->cadet;
-}
-
-const struct GNUNET_HashCode*
-get_room_key (const struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  return &(room->key);
-}
-
-const struct GNUNET_MESSENGER_SrvTunnel*
-get_room_tunnel (const struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_assert((room) && (peer));
-
-  return GNUNET_CONTAINER_multipeermap_get (room->tunnels, peer);
-}
-
-static int
-request_room_message_step (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash,
-                           const struct GNUNET_MESSENGER_MemberSession *session,
-                           GNUNET_MESSENGER_MessageRequestCallback callback, void* cls)
-{
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-
-  const struct GNUNET_MESSENGER_MessageLink *link = get_store_message_link(
-      message_store, hash, GNUNET_YES
-  );
-
-  if (!link)
-    goto forward;
-
-  int result = request_room_message_step(room, &(link->first), session, callback, cls);
-
-  if ((GNUNET_YES == link->multiple) &&
-      (GNUNET_YES == request_room_message_step(room, &(link->second), session, callback, cls)))
-    return GNUNET_YES;
-  else
-    return result;
-
-forward:
-  if (GNUNET_YES != check_member_session_history(session, hash, GNUNET_NO))
-    return GNUNET_YES;
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, hash);
-
-  if (!message)
-    return GNUNET_NO;
-
-  if (callback)
-    callback (cls, room, message, hash);
-
-  return GNUNET_YES;
-}
-
-int
-request_room_message (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash,
-                      const struct GNUNET_MESSENGER_MemberSession *session,
-                      GNUNET_MESSENGER_MessageRequestCallback callback, void* cls)
-{
-  GNUNET_assert((room) && (hash));
-
-  int result = request_room_message_step (room, hash, session, callback, cls);
-
-  if ((GNUNET_NO == result) && (callback))
-    callback (cls, room, NULL, hash);
-
-  return result;
-}
-
-void
-callback_room_disconnect (struct GNUNET_MESSENGER_SrvRoom *room, void *cls)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = cls;
-
-  if (!room->host)
-    return;
-
-  struct GNUNET_PeerIdentity identity;
-  get_tunnel_peer_identity(tunnel, &identity);
-
-  if ((GNUNET_YES != GNUNET_CONTAINER_multipeermap_remove (room->tunnels, &identity, tunnel)) ||
-      (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains(room->tunnels, &identity)))
-    return;
-
-  if (GNUNET_YES == contains_list_tunnels (&(room->basement), &identity))
-    send_room_message (room, room->host, create_message_miss (&identity));
-}
-
-int
-callback_verify_room_message (struct GNUNET_MESSENGER_SrvRoom *room, void *cls,
-                              struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash)
-{
-  if (GNUNET_MESSENGER_KIND_UNKNOWN == message->header.kind)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Message error: Kind is unknown! (%d)\n", message->header.kind);
-    return GNUNET_SYSERR;
-  }
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-
-  const struct GNUNET_MESSENGER_Message *previous = get_store_message(message_store, &(message->header.previous));
-
-  if (!previous)
-    goto skip_time_comparison;
-
-  struct GNUNET_TIME_Absolute timestamp = GNUNET_TIME_absolute_ntoh(message->header.timestamp);
-  struct GNUNET_TIME_Absolute last = GNUNET_TIME_absolute_ntoh(previous->header.timestamp);
-
-  if (GNUNET_TIME_relative_get_zero_().rel_value_us != GNUNET_TIME_absolute_get_difference(timestamp, last).rel_value_us)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Message error: Timestamp does not check out!\n");
-    return GNUNET_SYSERR;
-  }
-
-skip_time_comparison:
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Receiving message of kind: %s!\n",
-             GNUNET_MESSENGER_name_of_kind(message->header.kind));
-
-  return GNUNET_OK;
-}
-
-static void
-idle_request_room_messages (void *cls)
-{
-  struct GNUNET_MESSENGER_SrvRoom *room = cls;
-
-  room->idle = NULL;
-
-  struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(room);
-  const struct GNUNET_HashCode *hash = get_message_state_merge_hash(&(room->state));
-
-  if ((hash) &&
-      (GNUNET_MESSENGER_OP_UNKNOWN == get_store_operation_type(operation_store, hash)))
-    use_store_operation(
-        operation_store,
-        hash,
-        GNUNET_MESSENGER_OP_MERGE,
-        GNUNET_MESSENGER_MERGE_DELAY
-    );
-
-  room->idle = GNUNET_SCHEDULER_add_delayed_with_priority (
-      GNUNET_MESSENGER_IDLE_DELAY,
-      GNUNET_SCHEDULER_PRIORITY_IDLE,
-      idle_request_room_messages,
-      cls
-  );
-}
-
-void
-solve_room_member_collisions (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_IDENTITY_PublicKey *public_key,
-                              const struct GNUNET_ShortHashCode *member_id, struct GNUNET_TIME_Absolute timestamp)
-{
-  GNUNET_assert ((room) && (public_key) && (member_id));
-
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member(member_store, member_id);
-
-  if ((!member) || (1 >= GNUNET_CONTAINER_multihashmap_size(member->sessions)))
-    return;
-
-  struct GNUNET_MESSENGER_ListHandles *handles = &(room->service->handles);
-  struct GNUNET_MESSENGER_ListHandle* element;
-
-  for (element = handles->head; element; element = element->next)
-  {
-    if (0 != GNUNET_memcmp(member_id, get_handle_member_id(element->handle, get_room_key(room))))
-      continue;
-
-    if (0 == GNUNET_memcmp(public_key, &(get_handle_ego(element->handle)->pub)))
-      continue;
-
-    struct GNUNET_MESSENGER_MemberSession *session = get_member_session(member, &(get_handle_ego(element->handle)->pub));
-
-    if (!session)
-      continue;
-
-    struct GNUNET_TIME_Absolute start = get_member_session_start(session);
-
-    if (GNUNET_TIME_relative_get_zero_().rel_value_us != GNUNET_TIME_absolute_get_difference(start, timestamp).rel_value_us)
-      continue;
-
-    struct GNUNET_ShortHashCode random_id;
-    generate_free_member_id (&random_id, member_store->members);
-
-    send_room_message(room, element->handle, create_message_id(&random_id));
-  }
-}
-
-void
-rebuild_room_basement_structure (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  struct GNUNET_PeerIdentity peer;
-  size_t src;
-
-  if ((GNUNET_OK != get_service_peer_identity (room->service, &peer)) ||
-      (!find_list_tunnels (&(room->basement), &peer, &src)))
-    return;
-
-  size_t count = count_of_tunnels (&(room->basement));
-
-  struct GNUNET_MESSENGER_ListTunnel *element = room->basement.head;
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel;
-
-  size_t dst = 0;
-
-  while (element)
-  {
-    GNUNET_PEER_resolve (element->peer, &peer);
-
-    tunnel = GNUNET_CONTAINER_multipeermap_get (room->tunnels, &peer);
-
-    if (!tunnel)
-    {
-      element = remove_from_list_tunnels (&(room->basement), element);
-      continue;
-    }
-
-    if (GNUNET_YES == required_connection_between (count, src, dst))
-    {
-      if (GNUNET_SYSERR == connect_tunnel (tunnel))
-      {
-        element = remove_from_list_tunnels (&(room->basement), element);
-        continue;
-      }
-    }
-    else
-      disconnect_tunnel (tunnel);
-
-    element = element->next;
-    dst++;
-  }
-}
-
-static void
-handle_room_messages (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-
-  while (room->handling.head)
-  {
-    struct GNUNET_MESSENGER_ListMessage *element = room->handling.head;
-
-    const struct GNUNET_MESSENGER_Message *message = get_store_message (message_store, &(element->hash));
-
-    if (!message)
-      goto finish_handling;
-
-    struct GNUNET_MESSENGER_Member *member = get_store_member_of(member_store, message);
-
-    if (!member)
-      goto finish_handling;
-
-    struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of(member, message, &(element->hash));
-
-    if (session)
-      handle_service_message (room->service, room, session, message, &(element->hash));
-
-finish_handling:
-    GNUNET_CONTAINER_DLL_remove(room->handling.head, room->handling.tail, element);
-    GNUNET_free(element);
-  }
-}
-
-int
-update_room_message (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((room) && (message) && (hash));
-
-  struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(room);
-
-  const int requested = (GNUNET_MESSENGER_OP_REQUEST == get_store_operation_type(operation_store, hash)?
-      GNUNET_YES : GNUNET_NO
-  );
-
-  if (GNUNET_YES == requested)
-    cancel_store_operation(operation_store, hash);
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(room);
-
-  const struct GNUNET_MESSENGER_Message *old_message = get_store_message (message_store, hash);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Handle a message in room (%s).\n", GNUNET_h2s (get_room_key(room)));
-
-  if ((old_message) || (GNUNET_OK != put_store_message (message_store, hash, message)))
-  {
-    if (old_message != message)
-      destroy_message(message);
-
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Duplicate message got dropped!\n");
-    return GNUNET_NO;
-  }
-
-  update_message_state(&(room->state), requested, message, hash);
-
-  if ((GNUNET_YES == requested) ||
-      (GNUNET_MESSENGER_KIND_INFO == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_REQUEST == message->header.kind))
-    return GNUNET_YES;
-
-  if ((GNUNET_MESSENGER_KIND_MERGE == message->header.kind) &&
-      (GNUNET_MESSENGER_OP_MERGE == get_store_operation_type(operation_store, &(message->body.merge.previous))))
-    cancel_store_operation(operation_store, &(message->body.merge.previous));
-
-  if (GNUNET_MESSENGER_OP_MERGE == get_store_operation_type(operation_store, &(message->header.previous)))
-    cancel_store_operation(operation_store, &(message->header.previous));
-
-  return GNUNET_YES;
-}
-
-struct GNUNET_MESSENGER_MemberSessionCompletion
-{
-  struct GNUNET_MESSENGER_MemberSessionCompletion *prev;
-  struct GNUNET_MESSENGER_MemberSessionCompletion *next;
-
-  struct GNUNET_MESSENGER_MemberSession *session;
-};
-
-struct GNUNET_MESSENGER_MemberUpdate
-{
-  const struct GNUNET_MESSENGER_Message *message;
-  const struct GNUNET_HashCode *hash;
-
-  struct GNUNET_MESSENGER_MemberSessionCompletion *head;
-  struct GNUNET_MESSENGER_MemberSessionCompletion *tail;
-};
-
-static int
-iterate_update_member_sessions (void *cls, const struct GNUNET_IDENTITY_PublicKey *public_key,
-                                struct GNUNET_MESSENGER_MemberSession *session)
-{
-  struct GNUNET_MESSENGER_MemberUpdate *update = cls;
-
-  update_member_session_history(session, update->message, update->hash);
-
-  if (GNUNET_YES == is_member_session_completed(session))
-  {
-    struct GNUNET_MESSENGER_MemberSessionCompletion *element = GNUNET_new(
-        struct GNUNET_MESSENGER_MemberSessionCompletion
-    );
-
-    element->session = session;
-
-    GNUNET_CONTAINER_DLL_insert_tail(update->head, update->tail, element);
-  }
-
-  return GNUNET_YES;
-}
-
-static void
-remove_room_member_session (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session);
-
-void
-callback_room_handle_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                              const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_MemberStore *member_store = get_room_member_store(room);
-  struct GNUNET_MESSENGER_Member *member = get_store_member_of(member_store, message);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Callback for message (%s)\n", GNUNET_h2s (hash));
-
-  if (!member)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Message handling dropped: Member is missing!\n");
-    return;
-  }
-
-  struct GNUNET_MESSENGER_MemberSession *session = get_member_session_of(member, message, hash);
-
-  if (!session)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Message handling dropped: Session is missing!\n");
-    return;
-  }
-
-  struct GNUNET_MESSENGER_MemberUpdate update;
-  update.message = message;
-  update.hash = hash;
-
-  update.head = NULL;
-  update.tail = NULL;
-
-  iterate_store_members(member_store, iterate_update_member_sessions, &update);
-
-  while (update.head)
-  {
-    struct GNUNET_MESSENGER_MemberSessionCompletion *element = update.head;
-
-    remove_room_member_session (room, element->session);
-
-    GNUNET_CONTAINER_DLL_remove(update.head, update.tail, element);
-    GNUNET_free (element);
-  }
-
-  const int start_handle = room->handling.head ? GNUNET_NO : GNUNET_YES;
-
-  add_to_list_messages (&(room->handling), hash);
-
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_JOIN:
-    handle_message_join (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_LEAVE:
-    handle_message_leave (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_NAME:
-    handle_message_name (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_KEY:
-    handle_message_key (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_PEER:
-    handle_message_peer (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_ID:
-    handle_message_id (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_MISS:
-    handle_message_miss (room, session, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_DELETE:
-    handle_message_delete (room, session, message, hash);
-    break;
-  default:
-    break;
-  }
-
-  if (GNUNET_YES == start_handle)
-    handle_room_messages (room);
-}
-
-static void
-get_room_data_subdir (struct GNUNET_MESSENGER_SrvRoom *room, char **dir)
-{
-  GNUNET_assert((room) && (dir));
-
-  GNUNET_asprintf (dir, "%s%s%c%s%c", room->service->dir, "rooms", DIR_SEPARATOR, GNUNET_h2s (get_room_key(room)), DIR_SEPARATOR);
-}
-
-void
-load_room (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  char *room_dir;
-  get_room_data_subdir (room, &room_dir);
-
-  if (GNUNET_YES == GNUNET_DISK_directory_test (room_dir, GNUNET_YES))
-  {
-    load_member_store (get_room_member_store(room), room_dir);
-    load_message_store (get_room_message_store(room), room_dir);
-    load_operation_store(get_room_operation_store(room), room_dir);
-
-    char *basement_file;
-    GNUNET_asprintf (&basement_file, "%s%s", room_dir, "basement.list");
-
-    load_list_tunnels(&(room->basement), basement_file);
-    GNUNET_free(basement_file);
-
-    char *last_messages_file;
-    GNUNET_asprintf (&last_messages_file, "%s%s", room_dir, "last_messages.list");
-
-    load_message_state(&(room->state), room_dir);
-    GNUNET_free (last_messages_file);
-  }
-
-  GNUNET_free(room_dir);
-}
-
-void
-save_room (struct GNUNET_MESSENGER_SrvRoom *room)
-{
-  GNUNET_assert(room);
-
-  char *room_dir;
-  get_room_data_subdir (room, &room_dir);
-
-  if ((GNUNET_YES == GNUNET_DISK_directory_test (room_dir, GNUNET_NO)) ||
-      (GNUNET_OK == GNUNET_DISK_directory_create (room_dir)))
-  {
-    save_member_store(get_room_member_store(room), room_dir);
-    save_message_store (get_room_message_store(room), room_dir);
-    save_operation_store(get_room_operation_store(room), room_dir);
-
-    char *basement_file;
-    GNUNET_asprintf (&basement_file, "%s%s", room_dir, "basement.list");
-
-    save_list_tunnels(&(room->basement), basement_file);
-    GNUNET_free(basement_file);
-
-    save_message_state(&(room->state), room_dir);
-  }
-
-  GNUNET_free(room_dir);
-}
-
-static void
-remove_room_member_session (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session)
-{
-  GNUNET_assert ((room) && (session));
-
-  remove_member_session (session->member, session);
-
-  const struct GNUNET_IDENTITY_PublicKey *public_key = get_member_session_public_key(session);
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash(public_key, sizeof(*public_key), &hash);
-
-  char *room_dir;
-  get_room_data_subdir (room, &room_dir);
-
-  char* session_dir;
-  GNUNET_asprintf (
-      &session_dir, "%s%s%c%s%c%s%c%s%c", room_dir,
-      "members", DIR_SEPARATOR,
-      GNUNET_sh2s(get_member_session_id(session)), DIR_SEPARATOR,
-      "sessions", DIR_SEPARATOR,
-      GNUNET_h2s(&hash), DIR_SEPARATOR
-  );
-
-  GNUNET_free (room_dir);
-
-  GNUNET_DISK_directory_remove(session_dir);
-  GNUNET_free (session_dir);
-
-  destroy_member_session(session);
-}
diff --git a/src/messenger/gnunet-service-messenger_room.h b/src/messenger/gnunet-service-messenger_room.h
deleted file mode 100644
index 31ec877af..000000000
--- a/src/messenger/gnunet-service-messenger_room.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_room.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_ROOM_H
-#define GNUNET_SERVICE_MESSENGER_ROOM_H
-
-#include "platform.h"
-#include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
-
-#include "gnunet_messenger_service.h"
-#include "gnunet-service-messenger_basement.h"
-#include "gnunet-service-messenger_handle.h"
-#include "gnunet-service-messenger_message_state.h"
-#include "gnunet-service-messenger_list_messages.h"
-
-#include "messenger_api_list_tunnels.h"
-
-#include "gnunet-service-messenger_member_store.h"
-#include "gnunet-service-messenger_message_store.h"
-#include "gnunet-service-messenger_operation_store.h"
-#include "messenger_api_ego.h"
-
-#define GNUNET_MESSENGER_IDLE_DELAY GNUNET_TIME_relative_multiply \
-  (GNUNET_TIME_relative_get_second_ (), 5)
-
-#define GNUNET_MESSENGER_REQUEST_DELAY GNUNET_TIME_relative_multiply \
-  (GNUNET_TIME_relative_get_minute_ (), 5)
-
-#define GNUNET_MESSENGER_MERGE_DELAY GNUNET_TIME_relative_multiply \
-  (GNUNET_TIME_relative_get_second_ (), 30)
-
-struct GNUNET_MESSENGER_SrvTunnel;
-struct GNUNET_MESSENGER_MemberSession;
-
-struct GNUNET_MESSENGER_SrvRoom
-{
-  struct GNUNET_MESSENGER_Service *service;
-  struct GNUNET_MESSENGER_SrvHandle *host;
-  struct GNUNET_CADET_Port *port;
-
-  struct GNUNET_HashCode key;
-
-  struct GNUNET_CONTAINER_MultiPeerMap *tunnels;
-
-  struct GNUNET_MESSENGER_MemberStore member_store;
-  struct GNUNET_MESSENGER_MessageStore message_store;
-  struct GNUNET_MESSENGER_OperationStore operation_store;
-
-  struct GNUNET_MESSENGER_ListTunnels basement;
-  struct GNUNET_MESSENGER_MessageState state;
-
-  struct GNUNET_HashCode *peer_message;
-
-  struct GNUNET_MESSENGER_ListMessages handling;
-  struct GNUNET_SCHEDULER_Task *idle;
-};
-
-/**
- * Creates and allocates a new room for a <i>handle</i> with a given <i>key</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- * @return New room
- */
-struct GNUNET_MESSENGER_SrvRoom*
-create_room (struct GNUNET_MESSENGER_SrvHandle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Destroys a room and frees its memory fully.
- *
- * @param[in/out] room Room
- */
-void
-destroy_room (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Returns the used member store of a given <i>room</i>.
- *
- * @param[in/out] room Room
- * @return Member store
- */
-struct GNUNET_MESSENGER_MemberStore*
-get_room_member_store (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Returns the used message store of a given <i>room</i>.
- *
- * @param[in/out] room Room
- * @return Message store
- */
-struct GNUNET_MESSENGER_MessageStore*
-get_room_message_store (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Returns the used operation store of a given <i>room</i>.
- *
- * @param[in/out] room Room
- * @return Operation store
- */
-struct GNUNET_MESSENGER_OperationStore*
-get_room_operation_store (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Tries to open a <i>room</i> for a given <i>handle</i>. If the room has already been opened, the handle
- * will locally join the room.
- *
- * Calling this method should result in joining a room and sending a peer message as well for this peer.
- *
- * If the function returns #GNUNET_YES the port for this room is guaranteed to be open for incoming connections.
- *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
- * @return #GNUNET_YES on success, #GNUNET_NO on failure.
- */
-int
-open_room (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Connects a tunnel to a hosting peer of a <i>room</i> through a so called <i>door</i> which is represented by
- * a peer identity of a hosting peer. During the connection the handle will join the room as a member, waiting for
- * an info message from the selected host.
- *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
- * @param[in] door Peer identity
- * @return #GNUNET_YES on success, #GNUNET_NO on failure.
- */
-int
-enter_room_at (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-               const struct GNUNET_PeerIdentity *door);
-
-/**
- * Packs a <i>message</i> depending on the selected <i>mode</i> into a newly allocated envelope. It will set the
- * timestamp of the message, the sender id and the previous messages hash automatically before packing. The message
- * will be signed by the handles EGO.
- *
- * If the optional <i>hash</i> parameter is a valid pointer, its value will be overridden by the signed messages hash.
- *
- * If <i>mode</i> is set to #GNUNET_MESSENGER_PACK_MODE_ENVELOPE, the function returns a valid envelope to send
- * through a message queue, otherwise NULL.
- *
- * @param[in] room Room
- * @param[in] handle Handle
- * @param[in/out] message Message
- * @param[out] hash Hash of message
- * @param[in] mode Packing mode
- * @return New envelope or NULL
- */
-struct GNUNET_MQ_Envelope*
-pack_room_message (const struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash, int mode);
-
-/**
- * Sends a <i>message</i> from a given <i>handle</i> into a <i>room</i>. The <i>hash</i> parameter will be
- * updated with the hash-value resulting from the sent message.
- *
- * The function handles packing the message automatically and will call linked message-events locally even if
- * the message won't be sent to another peer.
- *
- * The function returns #GNUNET_YES on success, #GNUNET_NO if message is null and
- * #GNUNET_SYSERR if the message was known already.
- *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
- * @param[in/out] message Message
- * @return #GNUNET_YES on success, #GNUNET_NO or #GNUNET_SYSERR otherwise.
- */
-int
-send_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Forwards a <i>message</i> with a given <i>hash</i> to a specific <i>tunnel</i> inside of a <i>room</i>.
- *
- * @param[in/out] room Room
- * @param[in/out] tunnel Tunnel
- * @param[in/out] message Message
- * @param[in] hash Hash of message
- */
-void
-forward_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel,
-                      struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Checks the current state of opening a given <i>room</i> from this peer and re-publishes it
- * if necessary to a selected <i>tunnel</i> or to all connected tunnels if necessary or if the
- * selected tunnel is NULL.
- *
- * @param[in/out] room Room
- * @param[in/out] tunnel Tunnel
- */
-void
-check_room_peer_status (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Reduces all current forks inside of the message history of a <i>room</i> to one remaining last message
- * by merging them down. All merge messages will be sent from a given <i>handle</i>.
- *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
- */
-void
-merge_room_last_messages (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Deletes a message from the <i>room</i> with a given <i>hash</i> in a specific <i>delay</i> if
- * the provided member by its session is permitted to do so.
- *
- * @param[in/out] room Room
- * @param[in/out] session Member session
- * @param[in] hash Hash of message
- * @param[in] delay Delay of deletion
- * @return #GNUNET_YES on success, #GNUNET_NO if permission gets denied, #GNUNET_SYSERR on operation failure
- */
-int
-delete_room_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_MemberSession *session,
-                     const struct GNUNET_HashCode *hash, const struct GNUNET_TIME_Relative delay);
-
-/**
- * Returns the CADET handle from a rooms service.
- *
- * @param[in/out] room Room
- * @return CADET handle
- */
-struct GNUNET_CADET_Handle*
-get_room_cadet (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Returns the shared secret you need to access a <i>room</i>.
- *
- * @param[in] room Room
- * @return Shared secret
- */
-const struct GNUNET_HashCode*
-get_room_key (const struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Returns a tunnel inside of a <i>room</i> leading towards a given <i>peer</i> if such a tunnel exists,
- * otherwise NULL.
- *
- * @param[in] room Room
- * @param[in] peer Peer identity
- * @return Tunnel or NULL
- */
-const struct GNUNET_MESSENGER_SrvTunnel*
-get_room_tunnel (const struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_PeerIdentity *peer);
-
-/**
- * Method called whenever a <i>message</i> is found during a request in a <i>room</i>.
- *
- * @param[in/out] cls Closure from #request_room_message
- * @param[in/out] room Room
- * @param[in] message Message or NULL
- * @param[in] hash Hash of message
- */
-typedef void (GNUNET_MESSENGER_MessageRequestCallback) (
-    void *cls, struct GNUNET_MESSENGER_SrvRoom *room,
-    const struct GNUNET_MESSENGER_Message *message,
-    const struct GNUNET_HashCode *hash
-);
-
-/**
- * Requests a message from a <i>room</i> identified by a given <i>hash</i>. If the message is found,
- * the selected <i>callback</i> will be called with it and the provided closure. If no matching message
- * is found but it wasn't deleted the selected callback will be called with #NULL as message instead.
- * In case of deletion the next available previous message will be used to call the callback.
- *
- * It is also possible that the given callback will not be called if the requesting session is not
- * permitted!
- *
- * @param[in/out] room Room
- * @param[in] hash Hash of message
- * @param[in] callback Callback to process result
- * @param[in] cls Closure for the <i>callback</i>
- * @return #GNUNET_YES if the request could be processed, otherwise #GNUNET_NO
- */
-int
-request_room_message (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_HashCode *hash,
-                      const struct GNUNET_MESSENGER_MemberSession *session,
-                      GNUNET_MESSENGER_MessageRequestCallback callback, void* cls);
-
-/**
- * Checks for potential collisions with member ids and solves them changing active handles ids if they
- * use an already used member id (comparing public key and timestamp).
- *
- * @param[in/out] room Room
- * @param[in] public_key Public key of EGO
- * @param[in] member_id Member ID
- * @param[in] timestamp Timestamp
- */
-void
-solve_room_member_collisions (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_IDENTITY_PublicKey *public_key,
-                              const struct GNUNET_ShortHashCode *member_id, struct GNUNET_TIME_Absolute timestamp);
-
-/**
- * Rebuilds the decentralized structure for a <i>room</i> by ensuring all required connections are made
- * depending on the amount of peers and this peers index in the list of them.
- *
- * @param[in/out] room Room
- */
-void
-rebuild_room_basement_structure (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Loads the local configuration for a given <i>room</i> of a service which contains the last messages hash
- * and the ruleset for general access of new members.
- *
- * @param[out] room Room
- */
-void
-load_room (struct GNUNET_MESSENGER_SrvRoom *room);
-
-/**
- * Saves the configuration for a given <i>room</i> of a service which contains the last messages hash
- * and the ruleset for general access of new members locally.
- *
- * @param[in] room Room
- */
-void
-save_room (struct GNUNET_MESSENGER_SrvRoom *room);
-
-#endif //GNUNET_SERVICE_MESSENGER_ROOM_H
diff --git a/src/messenger/gnunet-service-messenger_service.c b/src/messenger/gnunet-service-messenger_service.c
deleted file mode 100644
index 8c63e9bf4..000000000
--- a/src/messenger/gnunet-service-messenger_service.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_service.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_service.h"
-#include "gnunet-service-messenger_message_kind.h"
-#include "gnunet-service-messenger.h"
-
-static void
-callback_shutdown_service (void *cls)
-{
-  struct GNUNET_MESSENGER_Service *service = cls;
-
-  if (service)
-  {
-    service->shutdown = NULL;
-
-    destroy_service (service);
-  }
-}
-
-struct GNUNET_MESSENGER_Service*
-create_service (const struct GNUNET_CONFIGURATION_Handle *config, struct GNUNET_SERVICE_Handle *service_handle)
-{
-  GNUNET_assert((config) && (service_handle));
-
-  struct GNUNET_MESSENGER_Service *service = GNUNET_new(struct GNUNET_MESSENGER_Service);
-
-  service->config = config;
-  service->service = service_handle;
-
-  service->shutdown = GNUNET_SCHEDULER_add_shutdown (&callback_shutdown_service, service);
-
-  service->dir = NULL;
-
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (service->config,
-  GNUNET_MESSENGER_SERVICE_NAME,
-                                                            "MESSENGER_DIR", &(service->dir)))
-  {
-    if (service->dir)
-      GNUNET_free(service->dir);
-
-    service->dir = NULL;
-  }
-  else
-  {
-    if ((GNUNET_YES != GNUNET_DISK_directory_test (service->dir, GNUNET_YES)) && (GNUNET_OK
-        != GNUNET_DISK_directory_create (service->dir)))
-    {
-      GNUNET_free(service->dir);
-
-      service->dir = NULL;
-    }
-  }
-
-  service->cadet = GNUNET_CADET_connect (service->config);
-
-  init_ego_store(get_service_ego_store(service), service->config);
-
-  init_list_handles (&(service->handles));
-
-  service->rooms = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-
-  init_contact_store(get_service_contact_store(service));
-
-  return service;
-}
-
-static int
-iterate_destroy_rooms (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_SrvRoom *room = value;
-  destroy_room (room);
-  return GNUNET_YES;
-}
-
-void
-destroy_service (struct GNUNET_MESSENGER_Service *service)
-{
-  GNUNET_assert(service);
-
-  if (service->shutdown)
-  {
-    GNUNET_SCHEDULER_cancel (service->shutdown);
-
-    service->shutdown = NULL;
-  }
-
-  clear_ego_store(get_service_ego_store(service));
-  clear_list_handles (&(service->handles));
-
-  GNUNET_CONTAINER_multihashmap_iterate (service->rooms, iterate_destroy_rooms, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (service->rooms);
-
-  clear_contact_store(get_service_contact_store(service));
-
-  if (service->cadet)
-  {
-    GNUNET_CADET_disconnect (service->cadet);
-
-    service->cadet = NULL;
-  }
-
-  if (service->dir)
-  {
-    GNUNET_free(service->dir);
-
-    service->dir = NULL;
-  }
-
-  GNUNET_SERVICE_shutdown (service->service);
-
-  GNUNET_free(service);
-}
-
-struct GNUNET_MESSENGER_EgoStore*
-get_service_ego_store (struct GNUNET_MESSENGER_Service *service)
-{
-  GNUNET_assert(service);
-
-  return &(service->ego_store);
-}
-
-struct GNUNET_MESSENGER_ContactStore*
-get_service_contact_store (struct GNUNET_MESSENGER_Service *service)
-{
-  GNUNET_assert(service);
-
-  return &(service->contact_store);
-}
-
-struct GNUNET_MESSENGER_SrvHandle*
-add_service_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MQ_Handle *mq)
-{
-  GNUNET_assert((service) && (mq));
-
-  struct GNUNET_MESSENGER_SrvHandle *handle = create_handle (service, mq);
-
-  if (handle)
-  {
-    add_list_handle (&(service->handles), handle);
-  }
-
-  return handle;
-}
-
-void
-remove_service_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle)
-{
-  GNUNET_assert((service) && (handle));
-
-  if (!handle)
-    return;
-
-  if (GNUNET_YES == remove_list_handle (&(service->handles), handle))
-    destroy_handle (handle);
-}
-
-int
-get_service_peer_identity (const struct GNUNET_MESSENGER_Service *service, struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_assert((service) && (peer));
-
-  return GNUNET_CRYPTO_get_peer_identity (service->config, peer);
-}
-
-struct GNUNET_MESSENGER_SrvRoom*
-get_service_room (const struct GNUNET_MESSENGER_Service *service, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((service) && (key));
-
-  return GNUNET_CONTAINER_multihashmap_get (service->rooms, key);
-}
-
-int
-open_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((service) && (handle) && (key));
-
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (service, key);
-
-  if (room)
-    return open_room (room, handle);
-
-  room = create_room (handle, key);
-
-  if ((GNUNET_YES == open_room (room, handle)) &&
-      (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (service->rooms,
-                                                       key, room,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
-    return GNUNET_YES;
-
-  destroy_room (room);
-  return GNUNET_NO;
-}
-
-int
-entry_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
-                    const struct GNUNET_PeerIdentity *door, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((service) && (handle) && (door) && (key));
-
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (service, key);
-
-  if (room)
-  {
-    if (GNUNET_YES == enter_room_at (room, handle, door))
-      return GNUNET_YES;
-    else
-      return GNUNET_NO;
-  }
-
-  room = create_room (handle, key);
-
-  if ((GNUNET_YES == enter_room_at (room, handle, door)) &&
-      (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (service->rooms,
-                                                       key, room,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)))
-  {
-    return GNUNET_YES;
-  }
-  else
-  {
-    destroy_room (room);
-    return GNUNET_NO;
-  }
-
-}
-
-int
-close_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
-                    const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((service) && (handle) && (key));
-
-  struct GNUNET_MESSENGER_SrvRoom *room = get_service_room (service, key);
-
-  if (!room)
-    return GNUNET_NO;
-
-  send_room_message (room, handle, create_message_leave ());
-
-  const struct GNUNET_ShortHashCode *id = get_handle_member_id (handle, key);
-
-  GNUNET_assert(id);
-
-  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (handle->member_ids, key, id))
-    return GNUNET_NO;
-
-  struct GNUNET_MESSENGER_SrvHandle *member_handle = (struct GNUNET_MESSENGER_SrvHandle*) find_list_handle_by_member (
-      &(service->handles), key);
-
-  if (!member_handle)
-  {
-    if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_remove (service->rooms, key, room))
-    {
-      destroy_room (room);
-      return GNUNET_YES;
-    }
-    else
-      return GNUNET_NO;
-  }
-
-  if (room->host == handle)
-    room->host = member_handle;
-
-  return GNUNET_YES;
-}
-
-void
-handle_service_message (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvRoom *room,
-                        const struct GNUNET_MESSENGER_MemberSession *session,
-                        const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((service) && (room) && (session) && (message) && (hash));
-
-  struct GNUNET_MESSENGER_ListHandle *element = service->handles.head;
-
-  while (element)
-  {
-    notify_handle_message (element->handle, get_room_key(room), session, message, hash);
-    element = element->next;
-  }
-}
diff --git a/src/messenger/gnunet-service-messenger_service.h b/src/messenger/gnunet-service-messenger_service.h
deleted file mode 100644
index aa43fa457..000000000
--- a/src/messenger/gnunet-service-messenger_service.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_service.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_SERVICE_H
-#define GNUNET_SERVICE_MESSENGER_SERVICE_H
-
-#include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_identity_service.h"
-
-#include "gnunet-service-messenger_ego_store.h"
-#include "gnunet-service-messenger_list_handles.h"
-
-#include "messenger_api_contact_store.h"
-#include "gnunet-service-messenger_room.h"
-
-#include "gnunet-service-messenger_member_session.h"
-
-struct GNUNET_MESSENGER_Service
-{
-  const struct GNUNET_CONFIGURATION_Handle *config;
-  struct GNUNET_SERVICE_Handle *service;
-
-  struct GNUNET_SCHEDULER_Task *shutdown;
-
-  char *dir;
-
-  struct GNUNET_CADET_Handle *cadet;
-
-  struct GNUNET_MESSENGER_EgoStore ego_store;
-  struct GNUNET_MESSENGER_ContactStore contact_store;
-
-  struct GNUNET_MESSENGER_ListHandles handles;
-
-  struct GNUNET_CONTAINER_MultiHashMap *rooms;
-};
-
-/**
- * Creates and allocates a new service using a given <i>config</i> and a GNUnet service handle.
- *
- * @param[in] config Configuration
- * @param[in/out] service_handle GNUnet service handle
- * @return New service
- */
-struct GNUNET_MESSENGER_Service*
-create_service (const struct GNUNET_CONFIGURATION_Handle *config, struct GNUNET_SERVICE_Handle *service_handle);
-
-/**
- * Destroys a <i>service</i> and frees its memory fully.
- *
- * @param[in/out] service Service
- */
-void
-destroy_service (struct GNUNET_MESSENGER_Service *service);
-
-/**
- * Returns the used EGO-store of a given <i>service</i>.
- *
- * @param[in/out] service Service
- * @return EGO-store
- */
-struct GNUNET_MESSENGER_EgoStore*
-get_service_ego_store (struct GNUNET_MESSENGER_Service *service);
-
-/**
- * Returns the used contact store of a given <i>service</i>.
- *
- * @param[in/out] service Service
- * @return Contact store
- */
-struct GNUNET_MESSENGER_ContactStore*
-get_service_contact_store (struct GNUNET_MESSENGER_Service *service);
-
-/**
- * Creates and adds a new handle to a <i>service</i> using a given message queue.
- *
- * @param[in/out] service Service
- * @param[in/out] mq Message queue
- * @return New handle
- */
-struct GNUNET_MESSENGER_SrvHandle*
-add_service_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MQ_Handle *mq);
-
-/**
- * Removes a <i>handle</i> from a <i>service</i> and destroys it.
- *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
- */
-void
-remove_service_handle (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle);
-
-/**
- * Tries to write the peer identity of the peer running a <i>service</i> on to the <i>peer</i>
- * parameter. The functions returns #GNUNET_OK on success, otherwise #GNUNET_SYSERR.
- *
- * @param[in] service Service
- * @param[out] peer Peer identity
- * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
- */
-int
-get_service_peer_identity (const struct GNUNET_MESSENGER_Service *service, struct GNUNET_PeerIdentity *peer);
-
-/**
- * Returns the room identified by a given <i>key</i> for a <i>service</i>. If the service doesn't know any room
- * using the given key, NULL gets returned.
- *
- * @param[in] service Service
- * @param[in] key Key of room
- * @return Room or NULL
- */
-struct GNUNET_MESSENGER_SrvRoom*
-get_service_room (const struct GNUNET_MESSENGER_Service *service, const struct GNUNET_HashCode *key);
-
-/**
- * Tries to open a room using a given <i>key</i> for a <i>service</i> by a specific <i>handle</i>. The room will be
- * created if necessary. If the function is successful, it returns #GNUNET_YES, otherwise #GNUNET_NO.
- *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-open_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
-                   const struct GNUNET_HashCode *key);
-
-/**
- * Tries to enter a room using a given <i>key</i> for a <i>service</i> by a specific <i>handle</i>. The room will
- * be created if necessary. If the function is successful, it returns #GNUNET_YES, otherwise #GNUNET_NO.
- *
- * The room will be entered through the peer identitied by the peer identity provided as <i>door</i> parameter and
- * a new connection will be made.
- *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
- * @param[in] door Peer identity
- * @param[in] key Key of room
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-entry_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
-                    const struct GNUNET_PeerIdentity *door, const struct GNUNET_HashCode *key);
-
-/**
- * Tries to close a room using a given <i>key</i> for a <i>service</i> by a specific <i>handle</i>. The room will
- * be created if necessary. If the function is successful, it returns #GNUNET_YES, otherwise #GNUNET_NO.
- *
- * If the specific handle is currently the host of the room for this service, a new handle which is a member will
- * take its place. Otherwise the room will be destroyed for this service.
- *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-close_service_room (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvHandle *handle,
-                    const struct GNUNET_HashCode *key);
-
-/**
- * Sends a received or sent <i>message</i> with a given <i>hash</i> to each handle of a <i>service</i> which
- * is currently member of a specific <i>room</i> for handling it in the client API.
- *
- * @param[in/out] service Service
- * @param[in/out] room Room
- * @param[in] session Member session
- * @param[in] message Message
- * @param[in] hash Hash of message
- */
-void
-handle_service_message (struct GNUNET_MESSENGER_Service *service, struct GNUNET_MESSENGER_SrvRoom *room,
-                        const struct GNUNET_MESSENGER_MemberSession *session,
-                        const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-#endif //GNUNET_SERVICE_MESSENGER_SERVICE_H
diff --git a/src/messenger/gnunet-service-messenger_tunnel.c b/src/messenger/gnunet-service-messenger_tunnel.c
deleted file mode 100644
index b9d063813..000000000
--- a/src/messenger/gnunet-service-messenger_tunnel.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_tunnel.c
- * @brief GNUnet MESSENGER service
- */
-
-#include "gnunet-service-messenger_tunnel.h"
-
-#include "gnunet-service-messenger_handle.h"
-#include "gnunet-service-messenger_message_recv.h"
-#include "gnunet-service-messenger_message_store.h"
-#include "gnunet-service-messenger_operation_store.h"
-#include "gnunet-service-messenger_operation.h"
-#include "messenger_api_util.h"
-
-struct GNUNET_MESSENGER_SrvTunnel*
-create_tunnel (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_PeerIdentity *door)
-{
-  GNUNET_assert((room) && (door));
-
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = GNUNET_new(struct GNUNET_MESSENGER_SrvTunnel);
-
-  tunnel->room = room;
-  tunnel->channel = NULL;
-
-  tunnel->peer = GNUNET_PEER_intern (door);
-
-  tunnel->messenger_version = 0;
-
-  tunnel->peer_message = NULL;
-
-  init_message_state(&(tunnel->state));
-
-  return tunnel;
-}
-
-void
-destroy_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  GNUNET_assert(tunnel);
-
-  if (tunnel->channel)
-    GNUNET_CADET_channel_destroy (tunnel->channel);
-
-  GNUNET_PEER_change_rc (tunnel->peer, -1);
-
-  if (tunnel->peer_message)
-    GNUNET_free(tunnel->peer_message);
-
-  clear_message_state(&(tunnel->state));
-
-  GNUNET_free(tunnel);
-}
-
-void
-bind_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_CADET_Channel *channel)
-{
-  GNUNET_assert(tunnel);
-
-  if (tunnel->channel)
-    delayed_disconnect_channel (tunnel->channel);
-
-  tunnel->channel = channel;
-}
-
-extern void
-callback_room_disconnect (struct GNUNET_MESSENGER_SrvRoom *room, void *cls);
-
-void
-callback_tunnel_disconnect (void *cls, const struct GNUNET_CADET_Channel *channel)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = cls;
-
-  if (tunnel)
-  {
-    tunnel->channel = NULL;
-
-    callback_room_disconnect (tunnel->room, cls);
-  }
-}
-
-extern int
-callback_verify_room_message (struct GNUNET_MESSENGER_SrvRoom *room, void *cls,
-                              struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash);
-
-int
-check_tunnel_message (void *cls, const struct GNUNET_MessageHeader *header)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = cls;
-
-  if (!tunnel)
-    return GNUNET_SYSERR;
-
-  const uint16_t length = ntohs (header->size) - sizeof(*header);
-  const char *buffer = (const char*) &header[1];
-
-  struct GNUNET_MESSENGER_Message message;
-
-  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Tunnel error: Message too short! (%d)\n", length);
-    return GNUNET_SYSERR;
-  }
-
-  uint16_t padding = 0;
-
-  if (GNUNET_YES != decode_message (&message, length, buffer, GNUNET_YES, &padding))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Tunnel error: Decoding failed!\n");
-    return GNUNET_SYSERR;
-  }
-
-  struct GNUNET_HashCode hash;
-  hash_message (&message, length - padding, buffer, &hash);
-
-  return callback_verify_room_message (tunnel->room, cls, &message, &hash);
-}
-
-extern int
-update_room_message (struct GNUNET_MESSENGER_SrvRoom *room,
-                     struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-extern void
-callback_room_handle_message (struct GNUNET_MESSENGER_SrvRoom *room, struct GNUNET_MESSENGER_SrvHandle *handle,
-                              const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-static void
-update_tunnel_last_message (struct GNUNET_MESSENGER_SrvTunnel *tunnel, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_OperationStore *operation_store = get_room_operation_store(tunnel->room);
-
-  const int requested = (GNUNET_MESSENGER_OP_REQUEST == get_store_operation_type(operation_store, hash)?
-      GNUNET_YES : GNUNET_NO
-  );
-
-  struct GNUNET_MESSENGER_MessageStore *message_store = get_room_message_store(tunnel->room);
-
-  const struct GNUNET_MESSENGER_Message *message = get_store_message(message_store, hash);
-
-  if (message)
-    update_message_state(&(tunnel->state), requested, message, hash);
-}
-
-void
-handle_tunnel_message (void *cls, const struct GNUNET_MessageHeader *header)
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel = cls;
-
-  const uint16_t length = ntohs (header->size) - sizeof(*header);
-  const char *buffer = (const char*) &header[1];
-
-  struct GNUNET_MESSENGER_Message message;
-  struct GNUNET_HashCode hash;
-
-  uint16_t padding = 0;
-
-  decode_message (&message, length, buffer, GNUNET_YES, &padding);
-  hash_message (&message, length - padding, buffer, &hash);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Got message of kind: %s!\n",
-             GNUNET_MESSENGER_name_of_kind(message.header.kind));
-
-  if (!tunnel)
-    return;
-
-  const int new_message = update_room_message (
-      tunnel->room, copy_message (&message), &hash
-  );
-
-  if (GNUNET_YES != new_message)
-    goto receive_done;
-
-  update_tunnel_last_message (tunnel, &hash);
-
-  int forward_message = GNUNET_YES;
-
-  switch (message.header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO:
-    forward_message = recv_message_info (tunnel->room, tunnel, &message, &hash);
-    break;
-  case GNUNET_MESSENGER_KIND_PEER:
-    forward_message = recv_message_peer (tunnel->room, tunnel, &message, &hash);
-    break;
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    forward_message = recv_message_request (tunnel->room, tunnel, &message, &hash);
-    break;
-  default:
-    break;
-  }
-
-  if (GNUNET_YES == forward_message)
-  {
-    forward_room_message (tunnel->room, tunnel, &message, &hash);
-    callback_room_handle_message (tunnel->room, NULL, &message, &hash);
-  }
-
-receive_done:
-  GNUNET_CADET_receive_done (tunnel->channel);
-}
-
-int
-connect_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  GNUNET_assert(tunnel);
-
-  if (tunnel->channel)
-    return GNUNET_NO;
-
-  const struct GNUNET_PeerIdentity *door = GNUNET_PEER_resolve2 (tunnel->peer);
-
-  struct GNUNET_CADET_Handle *cadet = get_room_cadet (tunnel->room);
-  const struct GNUNET_HashCode *key = get_room_key (tunnel->room);
-
-  struct GNUNET_MQ_MessageHandler handlers[] = { GNUNET_MQ_hd_var_size(tunnel_message, GNUNET_MESSAGE_TYPE_CADET_CLI,
-                                                                       struct GNUNET_MessageHeader, NULL),
-                                                 GNUNET_MQ_handler_end() };
-
-  struct GNUNET_HashCode port;
-  convert_messenger_key_to_port(key, &port);
-  tunnel->channel = GNUNET_CADET_channel_create (cadet, tunnel, door, &port, NULL, callback_tunnel_disconnect, handlers);
-
-  return GNUNET_YES;
-}
-
-void
-disconnect_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  GNUNET_assert(tunnel);
-
-  if (tunnel->channel)
-  {
-    delayed_disconnect_channel (tunnel->channel);
-
-    tunnel->channel = NULL;
-  }
-}
-
-int
-is_tunnel_connected (const struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  GNUNET_assert(tunnel);
-
-  return (tunnel->channel ? GNUNET_YES : GNUNET_NO);
-}
-
-struct GNUNET_MESSENGER_MessageSent
-{
-  struct GNUNET_MESSENGER_SrvTunnel *tunnel;
-  struct GNUNET_HashCode hash;
-};
-
-static void
-callback_tunnel_sent (void *cls)
-{
-  struct GNUNET_MESSENGER_MessageSent *sent = cls;
-
-  if (sent->tunnel)
-    update_tunnel_last_message (sent->tunnel, &(sent->hash));
-
-  GNUNET_free(sent);
-}
-
-void
-send_tunnel_envelope (struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MQ_Envelope *env,
-                      const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((tunnel) && (env) && (hash));
-
-  struct GNUNET_MQ_Handle *mq = GNUNET_CADET_get_mq (tunnel->channel);
-
-  struct GNUNET_MESSENGER_MessageSent *sent = GNUNET_new(struct GNUNET_MESSENGER_MessageSent);
-
-  GNUNET_memcpy(&(sent->hash), hash, sizeof(struct GNUNET_HashCode));
-
-  sent->tunnel = tunnel;
-
-  GNUNET_MQ_notify_sent (env, callback_tunnel_sent, sent);
-  GNUNET_MQ_send (mq, env);
-}
-
-int
-send_tunnel_message (struct GNUNET_MESSENGER_SrvTunnel *tunnel, void *handle, struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert((tunnel) && (handle));
-
-  if (!message)
-    return GNUNET_NO;
-
-  struct GNUNET_HashCode hash;
-  struct GNUNET_MQ_Envelope *env = pack_room_message (
-      tunnel->room, (struct GNUNET_MESSENGER_SrvHandle*) handle,
-      message, &hash, GNUNET_MESSENGER_PACK_MODE_ENVELOPE
-  );
-
-  destroy_message(message);
-
-  if (!env)
-    return GNUNET_NO;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending tunnel message: %s\n",
-             GNUNET_h2s(&hash));
-
-  send_tunnel_envelope (tunnel, env, &hash);
-  return GNUNET_YES;
-}
-
-void
-forward_tunnel_message (struct GNUNET_MESSENGER_SrvTunnel *tunnel, const struct GNUNET_MESSENGER_Message *message,
-                        const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((tunnel) && (message) && (hash));
-
-  struct GNUNET_MESSENGER_Message *copy = copy_message(message);
-  struct GNUNET_MQ_Envelope *env = pack_message (copy, NULL, NULL, GNUNET_MESSENGER_PACK_MODE_ENVELOPE);
-
-  destroy_message(copy);
-
-  if (!env)
-    return;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Forwarding tunnel message: %s\n",
-             GNUNET_h2s(hash));
-
-  send_tunnel_envelope (tunnel, env, hash);
-}
-
-const struct GNUNET_HashCode*
-get_tunnel_peer_message (const struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  GNUNET_assert(tunnel);
-
-  return tunnel->peer_message;
-}
-
-void
-get_tunnel_peer_identity (const struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_assert(tunnel);
-
-  GNUNET_PEER_resolve(tunnel->peer, peer);
-}
-
-uint32_t
-get_tunnel_messenger_version (const struct GNUNET_MESSENGER_SrvTunnel *tunnel)
-{
-  GNUNET_assert(tunnel);
-
-  return tunnel->messenger_version;
-}
-
-int
-update_tunnel_messenger_version (struct GNUNET_MESSENGER_SrvTunnel *tunnel, uint32_t version)
-{
-  GNUNET_assert(tunnel);
-
-  if (version != GNUNET_MESSENGER_VERSION)
-    return GNUNET_SYSERR;
-
-  if (version > tunnel->messenger_version)
-    tunnel->messenger_version = version;
-
-  return GNUNET_OK;
-}
diff --git a/src/messenger/gnunet-service-messenger_tunnel.h b/src/messenger/gnunet-service-messenger_tunnel.h
deleted file mode 100644
index 96d98546d..000000000
--- a/src/messenger/gnunet-service-messenger_tunnel.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/gnunet-service-messenger_tunnel.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_TUNNEL_H
-#define GNUNET_SERVICE_MESSENGER_TUNNEL_H
-
-#include "platform.h"
-#include "gnunet_cadet_service.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_crypto_lib.h"
-
-#include "gnunet-service-messenger_room.h"
-#include "gnunet-service-messenger_message_state.h"
-
-struct GNUNET_MESSENGER_SrvTunnel
-{
-  struct GNUNET_MESSENGER_SrvRoom *room;
-  struct GNUNET_CADET_Channel *channel;
-
-  GNUNET_PEER_Id peer;
-
-  uint32_t messenger_version;
-
-  struct GNUNET_HashCode *peer_message;
-  struct GNUNET_MESSENGER_MessageState state;
-};
-
-/**
- * Creates and allocates a tunnel of a <i>room</i> to a specific peer identity (called <i>door</i>).
- *
- * @param[in/out] room Room
- * @param[in] door Peer identity
- * @return New tunnel
- */
-struct GNUNET_MESSENGER_SrvTunnel*
-create_tunnel (struct GNUNET_MESSENGER_SrvRoom *room, const struct GNUNET_PeerIdentity *door);
-
-/**
- * Destroys a <i>tunnel</i> and frees its memory fully.
- *
- * @param[in/out] tunnel
- */
-void
-destroy_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Binds a CADET <i>channel</i> to a <i>tunnel</i> and replaces its channel
- * the tunnel is currently bound to if necessary.
- *
- * @param[in/out] tunnel Tunnel
- * @param[in/out] channel CADET channel
- */
-void
-bind_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_CADET_Channel *channel);
-
-/**
- * Tries to connect a <i>tunnel</i> by creating a new CADET channel and binding it.
- * The function returns #GNUNET_YES on success, otherwise #GNUNET_NO.
- *
- * @param[in/out] tunnel Tunnel
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-connect_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Disconnects and unbinds a channel from a <i>tunnel</i>. The actual disconnection
- * will be asynchronous.
- *
- * @param[in/out] tunnel Tunnel
- */
-void
-disconnect_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Returns the status of a currently bound channel of a <i>tunnel</i>.
- *
- * @param[in] tunnel Tunnel
- * @return #GNUNET_YES or #GNUNET_NO
- */
-int
-is_tunnel_connected (const struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Sends an envelope containing a <i>message</i> with a given <i>hash</i> through
- * a <i>tunnel</i>.
- *
- * @param[in/out] tunnel Tunnel
- * @param[in/out] env Envelope
- * @param[in] hash Hash of message
- */
-void
-send_tunnel_envelope (struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_MQ_Envelope *env,
-                      const struct GNUNET_HashCode *hash);
-
-/**
- * Sends a <i>message</i> by packing it automatically into an envelope and passing it
- * through the <i>tunnel</i>. The used <i>handle</i> will sign the message and
- * the <i>hash</i> will be calculated and stored.
- *
- * @param[in/out] tunnel Tunnel
- * @param[in/out] handle Handle
- * @param[in/out] message Message
- * @return #GNUNET_YES on success, GNUNET_NO otherwise
- */
-int
-send_tunnel_message (struct GNUNET_MESSENGER_SrvTunnel *tunnel, void *handle, struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Forwards a given <i>message</i> with a known <i>hash</i> through a <i>tunnel</i>.
- *
- * @param[in/out] tunnel Tunnel
- * @param[in] message Message
- * @param[in] hash Hash of message
- */
-void
-forward_tunnel_message (struct GNUNET_MESSENGER_SrvTunnel *tunnel, const struct GNUNET_MESSENGER_Message *message,
-                        const struct GNUNET_HashCode *hash);
-
-/**
- * Returns the hash of the latest peer message published through a given <i>tunnel</i>
- * and matching the tunnels peer identity. If no peer message has been linked to the tunnel
- * yet, NULL gets returned.
- *
- * @param[in] tunnel Tunnel
- * @return Hash of peer message or NULL
- */
-const struct GNUNET_HashCode*
-get_tunnel_peer_message (const struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Writes the peer identity of the peer connected via <i>tunnel</i> to this peer into
- * the <i>peer</i> parameter.
- *
- * @param[in] tunnel Tunnel
- * @param[out] peer Peer identity
- */
-void
-get_tunnel_peer_identity (const struct GNUNET_MESSENGER_SrvTunnel *tunnel, struct GNUNET_PeerIdentity *peer);
-
-/**
- * Returns the current messenger version the peer connected via a given <i>tunnel</i>
- * has reported to be using if it was compatible during updating.
- *
- * @see update_tunnel_messenger_version
- *
- * @param[in] tunnel Tunnel
- * @return Version of messenger
- */
-uint32_t
-get_tunnel_messenger_version (const struct GNUNET_MESSENGER_SrvTunnel *tunnel);
-
-/**
- * Updates the messenger version of the <i>tunnel</i> to a given <i>version</i> if
- * it is compatible to the running peer of the service. Depending on success it
- * returns #GNUNET_OK or #GNUNET_SYSERR on failure.
- *
- * @param[in/out] tunnel Tunnel
- * @param[in] version Version of messenger
- */
-int
-update_tunnel_messenger_version (struct GNUNET_MESSENGER_SrvTunnel *tunnel, uint32_t version);
-
-#endif //GNUNET_SERVICE_MESSENGER_TUNNEL_H
diff --git a/src/messenger/messenger.conf.in b/src/messenger/messenger.conf.in
deleted file mode 100644
index 59e11b166..000000000
--- a/src/messenger/messenger.conf.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[messenger]
-START_ON_DEMAND = YES
-PORT = 2097
-HOSTNAME = localhost
-BINARY = gnunet-service-messenger
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-messenger.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-# Directory to store messages and contacts
-MESSENGER_DIR = $GNUNET_DATA_HOME/messenger/
\ No newline at end of file
diff --git a/src/messenger/messenger_api.c b/src/messenger/messenger_api.c
deleted file mode 100644
index f7c73f769..000000000
--- a/src/messenger/messenger_api.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api.c
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#include "gnunet_messenger_service.h"
-
-#include "gnunet-service-messenger.h"
-
-#include "messenger_api_handle.h"
-#include "messenger_api_message.h"
-#include "messenger_api_util.h"
-
-const char*
-GNUNET_MESSENGER_name_of_kind (enum GNUNET_MESSENGER_MessageKind kind)
-{
-  switch (kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO:
-    return "INFO";
-  case GNUNET_MESSENGER_KIND_JOIN:
-    return "JOIN";
-  case GNUNET_MESSENGER_KIND_LEAVE:
-    return "LEAVE";
-  case GNUNET_MESSENGER_KIND_NAME:
-    return "NAME";
-  case GNUNET_MESSENGER_KIND_KEY:
-    return "KEY";
-  case GNUNET_MESSENGER_KIND_PEER:
-    return "PEER";
-  case GNUNET_MESSENGER_KIND_ID:
-    return "ID";
-  case GNUNET_MESSENGER_KIND_MISS:
-    return "MISS";
-  case GNUNET_MESSENGER_KIND_MERGE:
-    return "MERGE";
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    return "REQUEST";
-  case GNUNET_MESSENGER_KIND_INVITE:
-    return "INVITE";
-  case GNUNET_MESSENGER_KIND_TEXT:
-    return "TEXT";
-  case GNUNET_MESSENGER_KIND_FILE:
-    return "FILE";
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    return "PRIVATE";
-  default:
-    return "UNKNOWN";
-  }
-}
-
-static int
-check_get_name (void *cls, const struct GNUNET_MESSENGER_NameMessage *msg)
-{
-  GNUNET_MQ_check_zero_termination(msg);
-  return GNUNET_OK;
-}
-
-static void
-handle_get_name (void *cls, const struct GNUNET_MESSENGER_NameMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const char *name = ((const char*) msg) + sizeof(*msg);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Set name of handle: %s\n", name);
-
-  set_handle_name (handle, strlen (name) > 0 ? name : NULL);
-}
-
-static int
-check_get_key (void *cls, const struct GNUNET_MESSENGER_KeyMessage *msg)
-{
-  const uint16_t full_length = ntohs (msg->header.size);
-
-  if (full_length < sizeof(*msg))
-    return GNUNET_NO;
-
-  const uint16_t length = full_length - sizeof(*msg);
-  const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  struct GNUNET_IDENTITY_PublicKey pubkey;
-  if (GNUNET_IDENTITY_read_key_from_buffer(&pubkey, buffer, length) < 0)
-    return GNUNET_NO;
-
-  return GNUNET_OK;
-}
-
-static void
-handle_get_key (void *cls, const struct GNUNET_MESSENGER_KeyMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const uint16_t length = ntohs (msg->header.size) - sizeof(*msg);
-  const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  struct GNUNET_IDENTITY_PublicKey pubkey;
-  if (GNUNET_IDENTITY_read_key_from_buffer(&pubkey, buffer, length) < 0)
-    return;
-
-  char* str = GNUNET_IDENTITY_public_key_to_string (&pubkey);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Set key of handle: %s\n", str);
-  GNUNET_free(str);
-
-  set_handle_key (handle, &pubkey);
-
-  if (handle->identity_callback)
-    handle->identity_callback (handle->identity_cls, handle);
-}
-
-static void
-handle_member_id (void *cls, const struct GNUNET_MESSENGER_MemberMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const struct GNUNET_HashCode *key = &(msg->key);
-  const struct GNUNET_ShortHashCode *id = &(msg->id);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Set id of handle in room: %s\n", GNUNET_h2s (key));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if (room)
-  {
-    if (!room->contact_id)
-      room->contact_id = GNUNET_new(struct GNUNET_ShortHashCode);
-
-    GNUNET_memcpy(room->contact_id, id, sizeof(*id));
-  }
-}
-
-static void
-handle_room_open (void *cls, const struct GNUNET_MESSENGER_RoomMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const struct GNUNET_HashCode *key = &(msg->key);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Opened room: %s\n", GNUNET_h2s (key));
-
-  open_handle_room (handle, key);
-}
-
-static void
-handle_room_entry (void *cls, const struct GNUNET_MESSENGER_RoomMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const struct GNUNET_PeerIdentity *door = &(msg->door);
-  const struct GNUNET_HashCode *key = &(msg->key);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Entered room: %s\n", GNUNET_h2s (key));
-
-  entry_handle_room_at (handle, door, key);
-}
-
-static void
-handle_room_close (void *cls, const struct GNUNET_MESSENGER_RoomMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const struct GNUNET_HashCode *key = &(msg->key);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Closed room: %s\n", GNUNET_h2s (key));
-
-  close_handle_room (handle, key);
-}
-
-static int
-check_recv_message (void *cls, const struct GNUNET_MESSENGER_RecvMessage *msg)
-{
-  const uint16_t full_length = ntohs (msg->header.size);
-
-  if (full_length < sizeof(*msg))
-    return GNUNET_NO;
-
-  const uint16_t length = full_length - sizeof(*msg);
-  const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  struct GNUNET_MESSENGER_Message message;
-
-  if (length < get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN))
-    return GNUNET_NO;
-
-  if (GNUNET_YES != decode_message (&message, length, buffer, GNUNET_YES, NULL))
-    return GNUNET_NO;
-
-  return GNUNET_OK;
-}
-
-static void
-handle_recv_message (void *cls, const struct GNUNET_MESSENGER_RecvMessage *msg)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  const struct GNUNET_HashCode *key = &(msg->key);
-  const struct GNUNET_HashCode *sender = &(msg->sender);
-  const struct GNUNET_HashCode *context = &(msg->context);
-  const struct GNUNET_HashCode *hash = &(msg->hash);
-  const enum GNUNET_MESSENGER_MessageFlags flags = (
-      (enum GNUNET_MESSENGER_MessageFlags) (msg->flags)
-  );
-
-  const uint16_t length = ntohs (msg->header.size) - sizeof(*msg);
-  const char *buffer = ((const char*) msg) + sizeof(*msg);
-
-  struct GNUNET_MESSENGER_Message message;
-  decode_message (&message, length, buffer, GNUNET_YES, NULL);
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Receiving message: %s\n", GNUNET_MESSENGER_name_of_kind (message.header.kind));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if (room)
-  {
-    struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(handle);
-
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Raw contact from sender and context: (%s : %s)\n",
-               GNUNET_h2s(sender), GNUNET_h2s_full(context));
-
-    struct GNUNET_MESSENGER_Contact *contact = get_store_contact_raw(
-        store, context, sender
-    );
-
-    handle_room_message (room, contact, &message, hash);
-
-    if (handle->msg_callback)
-      handle->msg_callback (handle->msg_cls, room, contact, &message, hash, flags);
-  }
-  else
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Room not found\n");
-}
-
-static void
-reconnect (struct GNUNET_MESSENGER_Handle *handle);
-
-static void
-send_open_room (struct GNUNET_MESSENGER_Handle *handle, struct GNUNET_MESSENGER_Room *room)
-{
-  struct GNUNET_MESSENGER_RoomMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN);
-  GNUNET_memcpy(&(msg->key), &(room->key), sizeof(msg->key));
-  GNUNET_MQ_send (handle->mq, env);
-}
-
-static void
-send_enter_room (struct GNUNET_MESSENGER_Handle *handle, struct GNUNET_MESSENGER_Room *room,
-                 const struct GNUNET_PeerIdentity *door)
-{
-  struct GNUNET_MESSENGER_RoomMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY);
-  GNUNET_memcpy(&(msg->door), door, sizeof(*door));
-  GNUNET_memcpy(&(msg->key), &(room->key), sizeof(msg->key));
-  GNUNET_MQ_send (handle->mq, env);
-}
-
-static void
-send_close_room (struct GNUNET_MESSENGER_Handle *handle, struct GNUNET_MESSENGER_Room *room)
-{
-  struct GNUNET_MESSENGER_RoomMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE);
-  GNUNET_memcpy(&(msg->key), &(room->key), sizeof(msg->key));
-  GNUNET_MQ_send (handle->mq, env);
-}
-
-static int
-iterate_reset_room (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-  struct GNUNET_MESSENGER_Room *room = value;
-
-  if (GNUNET_YES == room->opened)
-    send_open_room (handle, room);
-
-  struct GNUNET_MESSENGER_ListTunnel *entry = room->entries.head;
-
-  struct GNUNET_PeerIdentity door;
-
-  while (entry)
-  {
-    GNUNET_PEER_resolve (entry->peer, &door);
-
-    send_enter_room (handle, room, &door);
-
-    entry = entry->next;
-  }
-
-  return GNUNET_YES;
-}
-
-static void
-callback_reconnect (void *cls)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  handle->reconnect_task = NULL;
-  handle->reconnect_time = GNUNET_TIME_STD_BACKOFF(handle->reconnect_time)
-  ;
-
-  reconnect (handle);
-
-  GNUNET_CONTAINER_multihashmap_iterate (handle->rooms, iterate_reset_room, handle);
-}
-
-static int
-iterate_close_room (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-  struct GNUNET_MESSENGER_Room *room = value;
-
-  send_close_room (handle, room);
-
-  return GNUNET_YES;
-}
-
-static void
-callback_mq_error (void *cls, enum GNUNET_MQ_Error error)
-{
-  struct GNUNET_MESSENGER_Handle *handle = cls;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "MQ_Error: %u\n", error);
-
-  GNUNET_CONTAINER_multihashmap_iterate (handle->rooms, iterate_close_room, handle);
-
-  if (handle->mq)
-  {
-    GNUNET_MQ_destroy (handle->mq);
-    handle->mq = NULL;
-  }
-
-  handle->reconnect_task = GNUNET_SCHEDULER_add_delayed (handle->reconnect_time, &callback_reconnect, handle);
-}
-
-static void
-reconnect (struct GNUNET_MESSENGER_Handle *handle)
-{
-  const struct GNUNET_MQ_MessageHandler handlers[] =
-  {
-   GNUNET_MQ_hd_var_size(
-        get_name, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_GET_NAME,
-        struct GNUNET_MESSENGER_NameMessage, handle
-   ),
-   GNUNET_MQ_hd_var_size(
-       get_key, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_GET_KEY,
-       struct GNUNET_MESSENGER_KeyMessage, handle
-   ),
-   GNUNET_MQ_hd_fixed_size(
-       member_id,
-       GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_MEMBER_ID,
-       struct GNUNET_MESSENGER_MemberMessage, handle
-   ),
-   GNUNET_MQ_hd_fixed_size(
-       room_open,
-       GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_OPEN,
-       struct GNUNET_MESSENGER_RoomMessage, handle
-   ),
-   GNUNET_MQ_hd_fixed_size(
-       room_entry,
-       GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_ENTRY,
-       struct GNUNET_MESSENGER_RoomMessage, handle
-   ),
-   GNUNET_MQ_hd_fixed_size(
-       room_close,
-       GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_CLOSE,
-       struct GNUNET_MESSENGER_RoomMessage, handle
-   ),
-   GNUNET_MQ_hd_var_size(
-       recv_message,
-       GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_RECV_MESSAGE,
-       struct GNUNET_MESSENGER_RecvMessage, handle
-   ),
-   GNUNET_MQ_handler_end()
-  };
-
-  handle->mq = GNUNET_CLIENT_connect (handle->cfg, GNUNET_MESSENGER_SERVICE_NAME, handlers, &callback_mq_error, handle);
-}
-
-struct GNUNET_MESSENGER_Handle*
-GNUNET_MESSENGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, const char *name,
-                          GNUNET_MESSENGER_IdentityCallback identity_callback, void *identity_cls,
-                          GNUNET_MESSENGER_MessageCallback msg_callback, void *msg_cls)
-{
-  struct GNUNET_MESSENGER_Handle *handle = create_handle (cfg, identity_callback, identity_cls, msg_callback, msg_cls);
-
-  reconnect (handle);
-
-  if (handle->mq)
-  {
-    const uint16_t name_len = name ? strlen (name) : 0;
-
-    struct GNUNET_MESSENGER_CreateMessage *msg;
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_msg_extra(msg, name_len + 1, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_CREATE);
-
-    char *extra = ((char*) msg) + sizeof(*msg);
-
-    if (name_len)
-      GNUNET_memcpy(extra, name, name_len);
-
-    extra[name_len] = '\0';
-
-    GNUNET_MQ_send (handle->mq, env);
-    return handle;
-  }
-  else
-  {
-    destroy_handle (handle);
-    return NULL;
-  }
-}
-
-int
-GNUNET_MESSENGER_update (struct GNUNET_MESSENGER_Handle *handle)
-{
-  if ((!handle) || (!get_handle_name (handle)))
-    return GNUNET_SYSERR;
-
-  struct GNUNET_MESSENGER_UpdateMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_UPDATE);
-  GNUNET_MQ_send (handle->mq, env);
-  return GNUNET_OK;
-}
-
-void
-GNUNET_MESSENGER_disconnect (struct GNUNET_MESSENGER_Handle *handle)
-{
-  if (!handle)
-    return;
-
-  struct GNUNET_MESSENGER_DestroyMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_DESTROY);
-  GNUNET_MQ_send (handle->mq, env);
-
-  destroy_handle (handle);
-}
-
-const char*
-GNUNET_MESSENGER_get_name (const struct GNUNET_MESSENGER_Handle *handle)
-{
-  if (!handle)
-    return NULL;
-
-  return get_handle_name (handle);
-}
-
-int
-GNUNET_MESSENGER_set_name (struct GNUNET_MESSENGER_Handle *handle, const char *name)
-{
-  if (!handle)
-    return GNUNET_SYSERR;
-
-  const uint16_t name_len = name ? strlen (name) : 0;
-
-  struct GNUNET_MESSENGER_NameMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  env = GNUNET_MQ_msg_extra(msg, name_len + 1, GNUNET_MESSAGE_TYPE_MESSENGER_CONNECTION_SET_NAME);
-
-  char *extra = ((char*) msg) + sizeof(*msg);
-
-  if (name_len)
-    GNUNET_memcpy(extra, name, name_len);
-
-  extra[name_len] = '\0';
-
-  GNUNET_MQ_send (handle->mq, env);
-  return GNUNET_YES;
-}
-
-static const struct GNUNET_IDENTITY_PublicKey*
-get_non_anonymous_key (const struct GNUNET_IDENTITY_PublicKey* public_key)
-{
-  if (0 == GNUNET_memcmp(public_key, get_anonymous_public_key()))
-    return NULL;
-
-  return public_key;
-}
-
-const struct GNUNET_IDENTITY_PublicKey*
-GNUNET_MESSENGER_get_key (const struct GNUNET_MESSENGER_Handle *handle)
-{
-  if (!handle)
-    return NULL;
-
-  return get_non_anonymous_key (get_handle_key (handle));
-}
-
-struct GNUNET_MESSENGER_Room*
-GNUNET_MESSENGER_open_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key)
-{
-  if ((!handle) || (!key))
-    return NULL;
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if (!room)
-  {
-    room = create_room (handle, key);
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (handle->rooms, key, room,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    {
-      destroy_room (room);
-      return NULL;
-    }
-  }
-
-  send_open_room (handle, room);
-  return room;
-}
-
-struct GNUNET_MESSENGER_Room*
-GNUNET_MESSENGER_enter_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_PeerIdentity *door,
-                             const struct GNUNET_HashCode *key)
-{
-  if ((!handle) || (!door) || (!key))
-    return NULL;
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if (!room)
-  {
-    room = create_room (handle, key);
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (handle->rooms, key, room,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    {
-      destroy_room (room);
-      return NULL;
-    }
-  }
-
-  send_enter_room (handle, room, door);
-  return room;
-}
-
-void
-GNUNET_MESSENGER_close_room (struct GNUNET_MESSENGER_Room *room)
-{
-  if (!room)
-    return;
-
-  send_close_room (room->handle, room);
-}
-
-struct GNUNET_MESSENGER_RoomFind
-{
-  const struct GNUNET_MESSENGER_Contact *contact;
-  GNUNET_MESSENGER_MemberCallback callback;
-  size_t counter;
-  void *cls;
-};
-
-static int
-iterate_find_room (void* cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_RoomFind *find = cls;
-  struct GNUNET_MESSENGER_Room *room = value;
-
-  if ((find->counter > 0) && ((!find->contact) || (GNUNET_YES == find_room_member(room, find->contact))))
-  {
-    find->counter--;
-
-    if (!find->callback)
-      return GNUNET_YES;
-
-    return find->callback(find->cls, room, find->contact);
-  }
-  else
-    return GNUNET_NO;
-}
-
-int
-GNUNET_MESSENGER_find_rooms (const struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_MESSENGER_Contact *contact,
-                             GNUNET_MESSENGER_MemberCallback callback, void *cls)
-{
-  if (!handle)
-    return GNUNET_SYSERR;
-
-  struct GNUNET_MESSENGER_RoomFind find;
-
-  find.contact = contact;
-  find.callback = callback;
-  find.counter = (contact? contact->rc : SIZE_MAX);
-  find.cls = cls;
-
-  return GNUNET_CONTAINER_multihashmap_iterate(handle->rooms, iterate_find_room, &find);
-}
-
-const struct GNUNET_HashCode*
-GNUNET_MESSENGER_room_get_key (const struct GNUNET_MESSENGER_Room *room)
-{
-  if (!room)
-    return NULL;
-
-  return &(room->key);
-}
-
-const struct GNUNET_MESSENGER_Contact*
-GNUNET_MESSENGER_get_sender (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash)
-{
-  if ((!room) || (!hash))
-    return NULL;
-
-  return get_room_sender(room, hash);
-}
-
-const char*
-GNUNET_MESSENGER_contact_get_name (const struct GNUNET_MESSENGER_Contact *contact)
-{
-  if (!contact)
-    return NULL;
-
-  return get_contact_name (contact);
-}
-
-const struct GNUNET_IDENTITY_PublicKey*
-GNUNET_MESSENGER_contact_get_key (const struct GNUNET_MESSENGER_Contact *contact)
-{
-  if (!contact)
-    return NULL;
-
-  return get_non_anonymous_key (get_contact_key (contact));
-}
-
-void
-GNUNET_MESSENGER_send_message (struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Message *message,
-                               const struct GNUNET_MESSENGER_Contact *contact)
-{
-  if ((!room) || (!message))
-    return;
-
-  switch (filter_message_sending (message))
-  {
-  case GNUNET_SYSERR:
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sending message aborted: This kind of message is reserved for the service!\n");
-    return;
-  case GNUNET_NO:
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Sending message aborted: This kind of message could cause issues!\n");
-    return;
-  default:
-    break;
-  }
-
-  ssize_t key_length = 0;
-
-  if (contact)
-  {
-    const struct GNUNET_IDENTITY_PublicKey *public_key = get_non_anonymous_key (
-        get_contact_key(contact)
-    );
-
-    if (public_key)
-      key_length = GNUNET_IDENTITY_key_get_length(public_key);
-    else
-      key_length = -1;
-  }
-
-  if (key_length < 0)
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Sending message aborted: Invalid key!\n");
-    return;
-  }
-
-  const uint16_t msg_length = get_message_size (message, GNUNET_NO);
-
-  struct GNUNET_MESSENGER_SendMessage *msg;
-  struct GNUNET_MQ_Envelope *env;
-
-  const uint16_t length = (uint16_t) key_length + msg_length;
-
-  env = GNUNET_MQ_msg_extra(
-      msg, length,
-      GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_SEND_MESSAGE
-  );
-
-  GNUNET_memcpy(&(msg->key), &(room->key), sizeof(msg->key));
-
-  msg->flags = (uint32_t) (
-      contact? GNUNET_MESSENGER_FLAG_PRIVATE : GNUNET_MESSENGER_FLAG_NONE
-  );
-
-  char *buffer = ((char*) msg) + sizeof(*msg);
-  char *msg_buffer = buffer + key_length;
-
-  if (key_length > 0)
-    GNUNET_IDENTITY_write_key_to_buffer(get_contact_key(contact), buffer, key_length);
-
-  encode_message (message, msg_length, msg_buffer, GNUNET_NO);
-
-  GNUNET_MQ_send (room->handle->mq, env);
-}
-
-const struct GNUNET_MESSENGER_Message*
-GNUNET_MESSENGER_get_message (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash)
-{
-  if ((!room) || (!hash))
-    return NULL;
-
-  const struct GNUNET_MESSENGER_Message *message = get_room_message (room, hash);
-
-  if (!message)
-  {
-    struct GNUNET_MESSENGER_GetMessage *msg;
-    struct GNUNET_MQ_Envelope *env;
-
-    env = GNUNET_MQ_msg(msg, GNUNET_MESSAGE_TYPE_MESSENGER_ROOM_GET_MESSAGE);
-    GNUNET_memcpy(&(msg->key), &(room->key), sizeof(msg->key));
-    GNUNET_memcpy(&(msg->hash), hash, sizeof(*hash));
-    GNUNET_MQ_send (room->handle->mq, env);
-  }
-
-  return message;
-}
-
-int
-GNUNET_MESSENGER_iterate_members (struct GNUNET_MESSENGER_Room *room, GNUNET_MESSENGER_MemberCallback callback,
-                                  void *cls)
-{
-  if (!room)
-    return GNUNET_SYSERR;
-
-  return iterate_room_members(room, callback, cls);
-}
diff --git a/src/messenger/messenger_api_contact.c b/src/messenger/messenger_api_contact.c
deleted file mode 100644
index 04e1f60c1..000000000
--- a/src/messenger/messenger_api_contact.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_contact.c
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_contact.h"
-
-struct GNUNET_MESSENGER_Contact*
-create_contact (const struct GNUNET_IDENTITY_PublicKey *key)
-{
-  GNUNET_assert(key);
-
-  struct GNUNET_MESSENGER_Contact *contact = GNUNET_new(struct GNUNET_MESSENGER_Contact);
-
-  contact->name = NULL;
-  contact->rc = 0;
-
-  GNUNET_memcpy(&(contact->public_key), key, sizeof(contact->public_key));
-
-  return contact;
-}
-
-void
-destroy_contact (struct GNUNET_MESSENGER_Contact *contact)
-{
-  GNUNET_assert(contact);
-
-  if (contact->name)
-    GNUNET_free(contact->name);
-
-  GNUNET_free(contact);
-}
-
-const char*
-get_contact_name (const struct GNUNET_MESSENGER_Contact *contact)
-{
-  GNUNET_assert(contact);
-
-  return contact->name;
-}
-
-void
-set_contact_name (struct GNUNET_MESSENGER_Contact *contact, const char *name)
-{
-  GNUNET_assert(contact);
-
-  if (contact->name)
-    GNUNET_free(contact->name);
-
-  contact->name = name ? GNUNET_strdup(name) : NULL;
-}
-
-const struct GNUNET_IDENTITY_PublicKey*
-get_contact_key (const struct GNUNET_MESSENGER_Contact *contact)
-{
-  GNUNET_assert(contact);
-
-  return &(contact->public_key);
-}
-
-void
-increase_contact_rc (struct GNUNET_MESSENGER_Contact *contact)
-{
-  GNUNET_assert(contact);
-
-  contact->rc++;
-}
-
-int
-decrease_contact_rc (struct GNUNET_MESSENGER_Contact *contact)
-{
-  GNUNET_assert(contact);
-
-  if (contact->rc > 0)
-    contact->rc--;
-
-  return contact->rc ? GNUNET_NO : GNUNET_YES;
-}
-
-void
-get_context_from_member (const struct GNUNET_HashCode *key, const struct GNUNET_ShortHashCode *id,
-                         struct GNUNET_HashCode *context)
-{
-  GNUNET_assert((key) && (id) && (context));
-
-  GNUNET_CRYPTO_hash (id, sizeof(*id), context);
-  GNUNET_CRYPTO_hash_xor (key, context, context);
-}
diff --git a/src/messenger/messenger_api_contact.h b/src/messenger/messenger_api_contact.h
deleted file mode 100644
index e94d1fcd0..000000000
--- a/src/messenger/messenger_api_contact.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_contact.h
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_CONTACT_H
-#define GNUNET_MESSENGER_API_CONTACT_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-
-struct GNUNET_MESSENGER_Contact
-{
-  char *name;
-  size_t rc;
-
-  struct GNUNET_IDENTITY_PublicKey public_key;
-};
-
-/**
- * Creates and allocates a new contact with a given public <i>key</i> from an EGO.
- *
- * @param[in] key Public key
- * @return New contact
- */
-struct GNUNET_MESSENGER_Contact*
-create_contact (const struct GNUNET_IDENTITY_PublicKey *key);
-
-/**
- * Destroys a contact and frees its memory fully.
- *
- * @param[in/out] contact Contact
- */
-void
-destroy_contact (struct GNUNET_MESSENGER_Contact *contact);
-
-/**
- * Returns the current name of a given <i>contact</i> or NULL if no valid name was assigned yet.
- *
- * @param[in] contact Contact
- * @return Name of the contact or NULL
- */
-const char*
-get_contact_name (const struct GNUNET_MESSENGER_Contact *contact);
-
-/**
- * Changes the current name of a given <i>contact</i> by copying it from the parameter <i>name</i>.
- *
- * @param[in/out] contact Contact
- * @param[in] name Name
- */
-void
-set_contact_name (struct GNUNET_MESSENGER_Contact *contact, const char *name);
-
-/**
- * Returns the public key of a given <i>contact</i>.
- *
- * @param[in] contact Contact
- * @return Public key of the contact
- */
-const struct GNUNET_IDENTITY_PublicKey*
-get_contact_key (const struct GNUNET_MESSENGER_Contact *contact);
-
-/**
- * Increases the reference counter of a given <i>contact</i> which is zero as default.
- *
- * @param[in/out] contact Contact
- */
-void
-increase_contact_rc (struct GNUNET_MESSENGER_Contact *contact);
-
-/**
- * Decreases the reference counter if possible (can not underflow!) of a given <i>contact</i>
- * and returns #GNUNET_YES if the counter is equal to zero, otherwise #GNUNET_NO.
- *
- * @param[in/out] contact Contact
- * @return #GNUNET_YES or #GNUNET_NO depending on the reference counter
- */
-int
-decrease_contact_rc (struct GNUNET_MESSENGER_Contact *contact);
-
-/**
- * Calculates the context <i>hash</i> of a member in a room and returns it.
- *
- * @param[in] key Key of room
- * @param[in] id Member id
- * @param[out] hash Member context
- */
-void
-get_context_from_member (const struct GNUNET_HashCode *key, const struct GNUNET_ShortHashCode *id,
-                         struct GNUNET_HashCode *context);
-
-#endif //GNUNET_MESSENGER_API_CONTACT_H
diff --git a/src/messenger/messenger_api_contact_store.c b/src/messenger/messenger_api_contact_store.c
deleted file mode 100644
index 6a517c2e0..000000000
--- a/src/messenger/messenger_api_contact_store.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_contact_store.c
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_contact_store.h"
-
-#include "messenger_api_contact.h"
-#include "messenger_api_util.h"
-
-void
-init_contact_store (struct GNUNET_MESSENGER_ContactStore *store)
-{
-  GNUNET_assert (store);
-
-  store->anonymous = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-  store->contacts = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-}
-
-static int
-iterate_destroy_contacts (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Contact *contact = value;
-  destroy_contact (contact);
-  return GNUNET_YES;
-}
-
-void
-clear_contact_store (struct GNUNET_MESSENGER_ContactStore *store)
-{
-  GNUNET_assert ((store) && (store->contacts));
-
-  GNUNET_CONTAINER_multihashmap_iterate (store->anonymous, iterate_destroy_contacts, NULL);
-  GNUNET_CONTAINER_multihashmap_iterate (store->contacts, iterate_destroy_contacts, NULL);
-
-  GNUNET_CONTAINER_multihashmap_destroy (store->anonymous);
-  GNUNET_CONTAINER_multihashmap_destroy (store->contacts);
-}
-
-static struct GNUNET_CONTAINER_MultiHashMap*
-select_store_contact_map (struct GNUNET_MESSENGER_ContactStore *store, const struct GNUNET_HashCode *context,
-                          struct GNUNET_HashCode *hash)
-{
-  const struct GNUNET_IDENTITY_PublicKey *anonymous = get_anonymous_public_key ();
-
-  struct GNUNET_HashCode anonHash;
-  GNUNET_CRYPTO_hash (anonymous, sizeof(*anonymous), &anonHash);
-
-  if ((context) && (0 == GNUNET_CRYPTO_hash_cmp(hash, &anonHash)))
-  {
-    GNUNET_memcpy(hash, context, sizeof(*context));
-    return store->anonymous;
-  }
-  else
-    return store->contacts;
-}
-
-struct GNUNET_MESSENGER_Contact*
-get_store_contact_raw (struct GNUNET_MESSENGER_ContactStore *store, const struct GNUNET_HashCode *context,
-                       const struct GNUNET_HashCode *key_hash)
-{
-  GNUNET_assert ((store) && (store->contacts) && (context) && (key_hash));
-
-  struct GNUNET_HashCode hash;
-  GNUNET_memcpy(&hash, key_hash, sizeof(*key_hash));
-
-  struct GNUNET_CONTAINER_MultiHashMap *map = select_store_contact_map (
-      store, context, &hash
-  );
-
-  return GNUNET_CONTAINER_multihashmap_get (map, &hash);
-}
-
-struct GNUNET_MESSENGER_Contact*
-get_store_contact (struct GNUNET_MESSENGER_ContactStore *store, const struct GNUNET_HashCode *context,
-                   const struct GNUNET_IDENTITY_PublicKey *pubkey)
-{
-  GNUNET_assert ((store) && (store->contacts) && (context) && (pubkey));
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &hash);
-
-  struct GNUNET_CONTAINER_MultiHashMap *map = select_store_contact_map (
-      store, context, &hash
-  );
-
-  struct GNUNET_MESSENGER_Contact *contact = GNUNET_CONTAINER_multihashmap_get (map, &hash);
-
-  if (contact)
-  {
-    if (0 != GNUNET_memcmp(pubkey, get_contact_key(contact)))
-    {
-      char* str = GNUNET_IDENTITY_public_key_to_string (get_contact_key(contact));
-      GNUNET_log (GNUNET_ERROR_TYPE_INVALID, "Contact in store uses wrong key: %s\n", str);
-      GNUNET_free (str);
-      return NULL;
-    }
-
-    return contact;
-  }
-
-  contact = create_contact (pubkey);
-
-  if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put (map, &hash, contact,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-    return contact;
-
-  destroy_contact (contact);
-  return NULL;
-}
-
-void
-update_store_contact (struct GNUNET_MESSENGER_ContactStore *store, struct GNUNET_MESSENGER_Contact* contact,
-                      const struct GNUNET_HashCode *context, const struct GNUNET_HashCode *next_context,
-                      const struct GNUNET_IDENTITY_PublicKey *pubkey)
-{
-  GNUNET_assert ((store) && (store->contacts) && (contact) && (pubkey));
-
-  const struct GNUNET_IDENTITY_PublicKey* oldkey = get_contact_key (contact);
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (oldkey, sizeof(*oldkey), &hash);
-
-  struct GNUNET_CONTAINER_MultiHashMap *map = select_store_contact_map (
-      store, context, &hash
-  );
-
-  if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (map, &hash, contact))
-  {
-    GNUNET_memcpy(&(contact->public_key), pubkey, sizeof(*pubkey));
-
-    GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &hash);
-
-    map = select_store_contact_map (
-        store, next_context, &hash
-    );
-
-    if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (map, &hash, contact,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-      GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Updating a contact failed: %s\n",
-                 GNUNET_h2s(&hash));
-  }
-}
-
-void
-remove_store_contact (struct GNUNET_MESSENGER_ContactStore *store, struct GNUNET_MESSENGER_Contact* contact,
-                      const struct GNUNET_HashCode *context)
-{
-  GNUNET_assert ((store) && (store->contacts) && (contact));
-
-  const struct GNUNET_IDENTITY_PublicKey* pubkey = get_contact_key(contact);
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &hash);
-
-  struct GNUNET_CONTAINER_MultiHashMap *map = select_store_contact_map (
-      store, context, &hash
-  );
-
-  if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (map, &hash, contact))
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Removing a contact failed: %s\n",
-               GNUNET_h2s(&hash));
-
-  destroy_contact (contact);
-}
diff --git a/src/messenger/messenger_api_contact_store.h b/src/messenger/messenger_api_contact_store.h
deleted file mode 100644
index f2dad9f84..000000000
--- a/src/messenger/messenger_api_contact_store.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_contact_store.h
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_CONTACT_STORE_H
-#define GNUNET_MESSENGER_API_CONTACT_STORE_H
-
-#include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-
-struct GNUNET_MESSENGER_Contact;
-
-struct GNUNET_MESSENGER_ContactStore
-{
-  struct GNUNET_CONTAINER_MultiHashMap *anonymous;
-  struct GNUNET_CONTAINER_MultiHashMap *contacts;
-};
-
-/**
- * Initializes a contact store as fully empty.
- *
- * @param[out] store Contact store
- */
-void
-init_contact_store (struct GNUNET_MESSENGER_ContactStore *store);
-
-/**
- * Clears a contact store, wipes its content and deallocates its memory.
- *
- * @param[in/out] store Contact store
- */
-void
-clear_contact_store (struct GNUNET_MESSENGER_ContactStore *store);
-
-/**
- * Returns a contact using the hash of a specific public key. In case the anonymous
- * key gets used by the requested contact, it will use its provided member
- * <i>context</i> to select the matching contact from the <i>store</i>.
- *
- * In case there is no contact stored which uses the given key or context,
- * NULL gets returned.
- *
- * @param[in/out] store Contact store
- * @param[in] context Member context
- * @param[in] key_hash Hash of public key
- */
-struct GNUNET_MESSENGER_Contact*
-get_store_contact_raw (struct GNUNET_MESSENGER_ContactStore *store, const struct GNUNET_HashCode *context,
-                       const struct GNUNET_HashCode *key_hash);
-
-/**
- * Returns a contact using a specific public key. In case the anonymous
- * key gets used by the requested contact, it will use its provided member
- * <i>context</i> to select the matching contact from the <i>store</i>.
- *
- * In case there is no contact stored which uses the given key or context,
- * a new contact will be created automatically.
- *
- * The function returns NULL if an error occurs during allocation
- * or validation of the contacts key.
- *
- * @param[in/out] store Contact store
- * @param[in] context Member context
- * @param[in] pubkey Public key of EGO
- */
-struct GNUNET_MESSENGER_Contact*
-get_store_contact (struct GNUNET_MESSENGER_ContactStore *store, const struct GNUNET_HashCode *context,
-                   const struct GNUNET_IDENTITY_PublicKey *pubkey);
-
-/**
- * Moves a <i>contact</i> from the <i>store</i> to another location
- * matching a given public key and member <i>context</i>.
- *
- * This function allows changes of keys or changes of member contexts!
- *
- * @param[in/out] store Contact store
- * @param[in/out] contact Contact
- * @param[in] context Member context
- * @param[in] next_context Member context
- * @param[in] pubkey Public key of EGO
- */
-void
-update_store_contact (struct GNUNET_MESSENGER_ContactStore *store, struct GNUNET_MESSENGER_Contact* contact,
-                      const struct GNUNET_HashCode *context, const struct GNUNET_HashCode *next_context,
-                      const struct GNUNET_IDENTITY_PublicKey *pubkey);
-
-/**
- * Removes a <i>contact</i> from the <i>store</i> which uses
- * a given member <i>context</i>.
- *
- * @param[in/out] store Contact store
- * @param[in/out] contact Contact
- * @param[in] context Member context
- */
-void
-remove_store_contact (struct GNUNET_MESSENGER_ContactStore *store, struct GNUNET_MESSENGER_Contact* contact,
-                      const struct GNUNET_HashCode *context);
-
-#endif //GNUNET_MESSENGER_API_CONTACT_STORE_H
diff --git a/src/messenger/messenger_api_ego.h b/src/messenger/messenger_api_ego.h
deleted file mode 100644
index b52b895f2..000000000
--- a/src/messenger/messenger_api_ego.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_ego.h
- * @brief GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_EGO_H
-#define GNUNET_MESSENGER_API_EGO_H
-
-#include "platform.h"
-#include "gnunet_identity_service.h"
-
-struct GNUNET_MESSENGER_Ego
-{
-  struct GNUNET_IDENTITY_PrivateKey priv;
-  struct GNUNET_IDENTITY_PublicKey pub;
-};
-
-#endif //GNUNET_MESSENGER_API_EGO_H
diff --git a/src/messenger/messenger_api_handle.c b/src/messenger/messenger_api_handle.c
deleted file mode 100644
index ab57f82cc..000000000
--- a/src/messenger/messenger_api_handle.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_handle.c
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_handle.h"
-
-#include "messenger_api_util.h"
-
-struct GNUNET_MESSENGER_Handle*
-create_handle (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_MESSENGER_IdentityCallback identity_callback,
-               void *identity_cls, GNUNET_MESSENGER_MessageCallback msg_callback, void *msg_cls)
-{
-  GNUNET_assert(cfg);
-
-  struct GNUNET_MESSENGER_Handle *handle = GNUNET_new(struct GNUNET_MESSENGER_Handle);
-
-  handle->cfg = cfg;
-  handle->mq = NULL;
-
-  handle->identity_callback = identity_callback;
-  handle->identity_cls = identity_cls;
-
-  handle->msg_callback = msg_callback;
-  handle->msg_cls = msg_cls;
-
-  handle->name = NULL;
-  handle->pubkey = NULL;
-
-  handle->reconnect_time = GNUNET_TIME_relative_get_zero_ ();
-  handle->reconnect_task = NULL;
-
-  handle->rooms = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-
-  init_contact_store(get_handle_contact_store(handle));
-
-  return handle;
-}
-
-static int
-iterate_destroy_room (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_Room *room = value;
-
-  destroy_room (room);
-
-  return GNUNET_YES;
-}
-
-void
-destroy_handle (struct GNUNET_MESSENGER_Handle *handle)
-{
-  GNUNET_assert(handle);
-
-  if (handle->reconnect_task)
-    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
-
-  if (handle->mq)
-    GNUNET_MQ_destroy (handle->mq);
-
-  if (handle->name)
-    GNUNET_free(handle->name);
-
-  if (handle->pubkey)
-    GNUNET_free(handle->pubkey);
-
-  if (handle->rooms)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (handle->rooms, iterate_destroy_room, NULL);
-
-    GNUNET_CONTAINER_multihashmap_destroy (handle->rooms);
-  }
-
-  clear_contact_store(get_handle_contact_store(handle));
-
-  GNUNET_free(handle->name);
-}
-
-void
-set_handle_name (struct GNUNET_MESSENGER_Handle *handle, const char *name)
-{
-  GNUNET_assert(handle);
-
-  if (handle->name)
-    GNUNET_free(handle->name);
-
-  handle->name = name ? GNUNET_strdup(name) : NULL;
-}
-
-const char*
-get_handle_name (const struct GNUNET_MESSENGER_Handle *handle)
-{
-  GNUNET_assert(handle);
-
-  return handle->name;
-}
-
-void
-set_handle_key (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_IDENTITY_PublicKey *pubkey)
-{
-  GNUNET_assert(handle);
-
-  if (!handle->pubkey)
-    handle->pubkey = GNUNET_new(struct GNUNET_IDENTITY_PublicKey);
-
-  GNUNET_memcpy(handle->pubkey, pubkey, sizeof(*pubkey));
-}
-
-const struct GNUNET_IDENTITY_PublicKey*
-get_handle_key (const struct GNUNET_MESSENGER_Handle *handle)
-{
-  GNUNET_assert(handle);
-
-  if (handle->pubkey)
-    return handle->pubkey;
-
-  return get_anonymous_public_key ();
-}
-
-struct GNUNET_MESSENGER_ContactStore*
-get_handle_contact_store (struct GNUNET_MESSENGER_Handle *handle)
-{
-  GNUNET_assert(handle);
-
-  return &(handle->contact_store);
-}
-
-struct GNUNET_MESSENGER_Contact*
-get_handle_contact (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if ((!room) || (!(room->contact_id)))
-    return NULL;
-
-  struct GNUNET_HashCode context;
-  get_context_from_member (key, room->contact_id, &context);
-
-  return get_store_contact(get_handle_contact_store(handle), &context, get_handle_key(handle));
-}
-
-void
-open_handle_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if (room)
-    room->opened = GNUNET_YES;
-}
-
-void
-entry_handle_room_at (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_PeerIdentity *door,
-                      const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (door) && (key));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if (room)
-    add_to_list_tunnels (&(room->entries), door);
-}
-
-void
-close_handle_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_CONTAINER_multihashmap_get (handle->rooms, key);
-
-  if ((room) && (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (handle->rooms, key, room)))
-    destroy_room (room);
-}
diff --git a/src/messenger/messenger_api_handle.h b/src/messenger/messenger_api_handle.h
deleted file mode 100644
index e6ca474f2..000000000
--- a/src/messenger/messenger_api_handle.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_handle.h
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_HANDLE_H
-#define GNUNET_MESSENGER_API_HANDLE_H
-
-#include "platform.h"
-#include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_peer_lib.h"
-
-#include "gnunet_messenger_service.h"
-
-#include "messenger_api_contact_store.h"
-#include "messenger_api_room.h"
-
-struct GNUNET_MESSENGER_Handle
-{
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  struct GNUNET_MQ_Handle *mq;
-
-  GNUNET_MESSENGER_IdentityCallback identity_callback;
-  void *identity_cls;
-
-  GNUNET_MESSENGER_MessageCallback msg_callback;
-  void *msg_cls;
-
-  char *name;
-  struct GNUNET_IDENTITY_PublicKey *pubkey;
-
-  struct GNUNET_TIME_Relative reconnect_time;
-  struct GNUNET_SCHEDULER_Task *reconnect_task;
-
-  struct GNUNET_MESSENGER_ContactStore contact_store;
-
-  struct GNUNET_CONTAINER_MultiHashMap *rooms;
-};
-
-/**
- * Creates and allocates a new handle using a given configuration and a custom message callback
- * with a given closure for the client API.
- *
- * @param[in] cfg Configuration
- * @param[in] msg_callback Message callback
- * @param[in/out] msg_cls Closure
- * @return New handle
- */
-struct GNUNET_MESSENGER_Handle*
-create_handle (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_MESSENGER_IdentityCallback identity_callback,
-               void *identity_cls, GNUNET_MESSENGER_MessageCallback msg_callback, void *msg_cls);
-
-/**
- * Destroys a <i>handle</i> and frees its memory fully from the client API.
- *
- * @param[in/out] handle Handle
- */
-void
-destroy_handle (struct GNUNET_MESSENGER_Handle *handle);
-
-/**
- * Sets the name of a <i>handle</i> to a specific <i>name</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] name New name
- */
-void
-set_handle_name (struct GNUNET_MESSENGER_Handle *handle, const char *name);
-
-/**
- * Returns the current name of a given <i>handle</i> or NULL if no valid name was assigned yet.
- *
- * @param[in] handle Handle
- * @return Name of the handle or NULL
- */
-const char*
-get_handle_name (const struct GNUNET_MESSENGER_Handle *handle);
-
-/**
- * Sets the public key of a given <i>handle</i> to a specific public key.
- *
- * @param[in/out] handle Handle
- * @param[in] pubkey Public key
- */
-void
-set_handle_key (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_IDENTITY_PublicKey *pubkey);
-
-/**
- * Returns the public key of a given <i>handle</i>.
- *
- * @param[in] handle Handle
- * @return Public key of the handle
- */
-const struct GNUNET_IDENTITY_PublicKey*
-get_handle_key (const struct GNUNET_MESSENGER_Handle *handle);
-
-/**
- * Returns the used contact store of a given <i>handle</i>.
- *
- * @param[in/out] handle Handle
- * @return Contact store
- */
-struct GNUNET_MESSENGER_ContactStore*
-get_handle_contact_store (struct GNUNET_MESSENGER_Handle *handle);
-
-/**
- * Returns the contact of a given <i>handle</i> in a room identified by a
- * given <i>key</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- * @return Contact
- */
-struct GNUNET_MESSENGER_Contact*
-get_handle_contact (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Marks a room known to a <i>handle</i> identified by a given <i>key</i> as open.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- */
-void
-open_handle_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Adds a tunnel for a room known to a <i>handle</i> identified by a given <i>key</i> to a
- * list of opened connections.
- *
- * @param[in/out] handle Handle
- * @param[in] door Peer identity
- * @param[in] key Key of room
- */
-void
-entry_handle_room_at (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_PeerIdentity *door,
-                      const struct GNUNET_HashCode *key);
-
-/**
- * Destroys and so implicitly closes a room known to a <i>handle</i> identified by a given <i>key</i>.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- */
-void
-close_handle_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key);
-
-#endif //GNUNET_MESSENGER_API_HANDLE_H
diff --git a/src/messenger/messenger_api_list_tunnels.c b/src/messenger/messenger_api_list_tunnels.c
deleted file mode 100644
index 990e36878..000000000
--- a/src/messenger/messenger_api_list_tunnels.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_list_tunnels.c
- * @brief messenger api: client and service implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_list_tunnels.h"
-
-void
-init_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels)
-{
-  GNUNET_assert(tunnels);
-
-  tunnels->head = NULL;
-  tunnels->tail = NULL;
-}
-
-void
-clear_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels)
-{
-  GNUNET_assert(tunnels);
-
-  struct GNUNET_MESSENGER_ListTunnel *element;
-
-  for (element = tunnels->head; element; element = tunnels->head)
-  {
-    GNUNET_CONTAINER_DLL_remove(tunnels->head, tunnels->tail, element);
-    GNUNET_PEER_change_rc (element->peer, -1);
-    GNUNET_free(element);
-  }
-
-  tunnels->head = NULL;
-  tunnels->tail = NULL;
-}
-
-static int
-compare_list_tunnels (void *cls, struct GNUNET_MESSENGER_ListTunnel *element0,
-                      struct GNUNET_MESSENGER_ListTunnel *element1)
-{
-  return ((int) element0->peer) - ((int) element1->peer);
-}
-
-void
-add_to_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_assert((tunnels) && (peer));
-
-  struct GNUNET_MESSENGER_ListTunnel *element = GNUNET_new(struct GNUNET_MESSENGER_ListTunnel);
-
-  element->peer = GNUNET_PEER_intern (peer);
-
-  GNUNET_CONTAINER_DLL_insert_sorted(struct GNUNET_MESSENGER_ListTunnel, compare_list_tunnels, NULL, tunnels->head,
-                                     tunnels->tail, element);
-}
-
-struct GNUNET_MESSENGER_ListTunnel*
-find_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const struct GNUNET_PeerIdentity *peer, size_t *index)
-{
-  GNUNET_assert((tunnels) && (peer));
-
-  struct GNUNET_MESSENGER_ListTunnel *element;
-  struct GNUNET_PeerIdentity pid;
-
-  if (index)
-    *index = 0;
-
-  for (element = tunnels->head; element; element = element->next)
-  {
-    GNUNET_PEER_resolve (element->peer, &pid);
-
-    if (0 == GNUNET_memcmp(&pid, peer))
-      return element;
-
-    if (index)
-      (*index) = (*index) + 1;
-  }
-
-  return NULL;
-}
-
-int
-contains_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const struct GNUNET_PeerIdentity *peer)
-{
-  GNUNET_assert((tunnels) && (peer));
-
-  return find_list_tunnels (tunnels, peer, NULL) != NULL ? GNUNET_YES : GNUNET_NO;
-}
-
-struct GNUNET_MESSENGER_ListTunnel*
-remove_from_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, struct GNUNET_MESSENGER_ListTunnel *element)
-{
-  GNUNET_assert((tunnels) && (element));
-
-  struct GNUNET_MESSENGER_ListTunnel *next = element->next;
-
-  GNUNET_CONTAINER_DLL_remove(tunnels->head, tunnels->tail, element);
-  GNUNET_PEER_change_rc (element->peer, -1);
-  GNUNET_free(element);
-
-  return next;
-}
-
-void
-load_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const char *path)
-{
-  GNUNET_assert((tunnels) && (path));
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (path))
-    return;
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open(
-      path, GNUNET_DISK_OPEN_READ, permission
-  );
-
-  if (!handle)
-    return;
-
-  GNUNET_DISK_file_seek(handle, 0, GNUNET_DISK_SEEK_SET);
-
-  struct GNUNET_PeerIdentity peer;
-  ssize_t len;
-
-  do {
-    len = GNUNET_DISK_file_read(handle, &peer, sizeof(peer));
-
-    if (len != sizeof(peer))
-      break;
-
-    add_to_list_tunnels(tunnels, &peer);
-  } while (len == sizeof(peer));
-
-  GNUNET_DISK_file_close(handle);
-}
-
-void
-save_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const char *path)
-{
-  GNUNET_assert((tunnels) && (path));
-
-  enum GNUNET_DISK_AccessPermissions permission = (GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-
-  struct GNUNET_DISK_FileHandle *handle = GNUNET_DISK_file_open(
-      path, GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE, permission
-  );
-
-  if (!handle)
-    return;
-
-  GNUNET_DISK_file_seek(handle, 0, GNUNET_DISK_SEEK_SET);
-
-  struct GNUNET_MESSENGER_ListTunnel *element;
-  struct GNUNET_PeerIdentity pid;
-
-  for (element = tunnels->head; element; element = element->next)
-  {
-    GNUNET_PEER_resolve (element->peer, &pid);
-
-    GNUNET_DISK_file_write(handle, &pid, sizeof(pid));
-  }
-
-  GNUNET_DISK_file_sync(handle);
-  GNUNET_DISK_file_close(handle);
-}
diff --git a/src/messenger/messenger_api_list_tunnels.h b/src/messenger/messenger_api_list_tunnels.h
deleted file mode 100644
index c952da3c2..000000000
--- a/src/messenger/messenger_api_list_tunnels.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_list_tunnels.h
- * @brief messenger api: client and service implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_LIST_TUNNELS_H
-#define GNUNET_MESSENGER_API_LIST_TUNNELS_H
-
-#include "platform.h"
-#include "gnunet_peer_lib.h"
-#include "gnunet_container_lib.h"
-
-struct GNUNET_MESSENGER_ListTunnel
-{
-  struct GNUNET_MESSENGER_ListTunnel *prev;
-  struct GNUNET_MESSENGER_ListTunnel *next;
-
-  GNUNET_PEER_Id peer;
-};
-
-struct GNUNET_MESSENGER_ListTunnels
-{
-  struct GNUNET_MESSENGER_ListTunnel *head;
-  struct GNUNET_MESSENGER_ListTunnel *tail;
-};
-
-/**
- * Initializes list of tunnels peer identities as empty list.
- *
- * @param[out] tunnels List of peer identities
- */
-void
-init_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels);
-
-/**
- * Clears the list of tunnels peer identities.
- *
- * @param[in/out] tunnels List of peer identities
- */
-void
-clear_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels);
-
-/**
- * Adds a specific <i>peer</i> from a tunnel to the end of the list.
- *
- * @param[in/out] tunnels List of peer identities
- * @param[in] peer Peer identity of tunnel
- */
-void
-add_to_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const struct GNUNET_PeerIdentity *peer);
-
-/**
- * Searches linearly through the list of tunnels peer identities for matching a
- * specific <i>peer</i> identity and returns the matching element of the list.
- *
- * If no matching element is found, NULL gets returned.
- *
- * If <i>index</i> is not NULL, <i>index</i> will be overridden with the numeric index of
- * the found element in the list. If no matching element is found, <i>index</i> will
- * contain the total amount of elements in the list.
- *
- * @param[in/out] tunnels List of peer identities
- * @param[in] peer Peer identity of tunnel
- * @param[out] index Index of found element (optional)
- * @return Element in the list with matching peer identity
- */
-struct GNUNET_MESSENGER_ListTunnel*
-find_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const struct GNUNET_PeerIdentity *peer, size_t *index);
-
-/**
- * Tests linearly if the list of tunnels peer identities contains a specific
- * <i>peer</i> identity and returns #GNUNET_YES on success, otherwise #GNUNET_NO.
- *
- * @param[in/out] tunnels List of peer identities
- * @param[in] peer Peer identity of tunnel
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-contains_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const struct GNUNET_PeerIdentity *peer);
-
-/**
- * Removes a specific <i>element</i> from the list of tunnels peer identities and returns
- * the next element in the list.
- *
- * @param[in/out] tunnels List of peer identities
- * @param[in/out] element Element of the list
- * @return Next element in the list
- */
-struct GNUNET_MESSENGER_ListTunnel*
-remove_from_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, struct GNUNET_MESSENGER_ListTunnel *element);
-
-/**
- * Loads the list of tunnels peer identities from a file under a given <i>path</i>.
- *
- * @param[out] messages List of hashes
- * @param[in] path Path of file
- */
-void
-load_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const char *path);
-
-/**
- * Saves the list of tunnels peer identities to a file under a given <i>path</i>.
- *
- * @param[in] messages List of hashes
- * @param[in] path Path of file
- */
-void
-save_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels, const char *path);
-
-#endif //GNUNET_MESSENGER_API_LIST_TUNNELS_H
diff --git a/src/messenger/messenger_api_message.c b/src/messenger/messenger_api_message.c
deleted file mode 100644
index c7364d51c..000000000
--- a/src/messenger/messenger_api_message.c
+++ /dev/null
@@ -1,877 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_message.c
- * @brief messenger api: client and service implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_message.h"
-
-struct GNUNET_MESSENGER_MessageSignature
-{
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-  struct GNUNET_HashCode hash;
-};
-
-struct GNUNET_MESSENGER_ShortMessage
-{
-  enum GNUNET_MESSENGER_MessageKind kind;
-  struct GNUNET_MESSENGER_MessageBody body;
-};
-
-struct GNUNET_MESSENGER_Message*
-create_message (enum GNUNET_MESSENGER_MessageKind kind)
-{
-  struct GNUNET_MESSENGER_Message *message = GNUNET_new(struct GNUNET_MESSENGER_Message);
-
-  message->header.kind = kind;
-
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_NAME:
-    message->body.name.name = NULL;
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    message->body.text.text = NULL;
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    message->body.file.uri = NULL;
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    message->body.privacy.length = 0;
-    message->body.privacy.data = NULL;
-    break;
-  default:
-    break;
-  }
-
-  return message;
-}
-
-struct GNUNET_MESSENGER_Message*
-copy_message (const struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert(message);
-
-  struct GNUNET_MESSENGER_Message *copy = GNUNET_new(struct GNUNET_MESSENGER_Message);
-
-  GNUNET_memcpy(copy, message, sizeof(struct GNUNET_MESSENGER_Message));
-
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_NAME:
-    copy->body.name.name = GNUNET_strdup(message->body.name.name);
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    copy->body.text.text = GNUNET_strdup(message->body.text.text);
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    copy->body.file.uri = GNUNET_strdup(message->body.file.uri);
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    copy->body.privacy.data = copy->body.privacy.length ? GNUNET_malloc(copy->body.privacy.length) : NULL;
-
-    if (copy->body.privacy.data)
-    {
-      GNUNET_memcpy(copy->body.privacy.data, message->body.privacy.data, copy->body.privacy.length);
-    }
-
-    break;
-  default:
-    break;
-  }
-
-  return copy;
-}
-
-static void
-destroy_message_body (enum GNUNET_MESSENGER_MessageKind kind, struct GNUNET_MESSENGER_MessageBody *body)
-{
-  switch (kind)
-  {
-  case GNUNET_MESSENGER_KIND_NAME:
-    GNUNET_free(body->name.name);
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    GNUNET_free(body->text.text);
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    GNUNET_free(body->file.uri);
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    GNUNET_free(body->privacy.data);
-    break;
-  default:
-    break;
-  }
-}
-
-void
-destroy_message (struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert(message);
-
-  destroy_message_body (message->header.kind, &(message->body));
-
-  GNUNET_free(message);
-}
-
-int
-is_message_session_bound (const struct GNUNET_MESSENGER_Message *message)
-{
-  GNUNET_assert(message);
-
-  if ((GNUNET_MESSENGER_KIND_JOIN == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_LEAVE == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_NAME == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_KEY == message->header.kind) ||
-      (GNUNET_MESSENGER_KIND_ID == message->header.kind))
-    return GNUNET_YES;
-  else
-    return GNUNET_NO;
-}
-
-static void
-fold_short_message (const struct GNUNET_MESSENGER_Message *message, struct GNUNET_MESSENGER_ShortMessage *shortened)
-{
-  shortened->kind = message->header.kind;
-
-  GNUNET_memcpy(&(shortened->body), &(message->body), sizeof(struct GNUNET_MESSENGER_MessageBody));
-}
-
-static void
-unfold_short_message (struct GNUNET_MESSENGER_ShortMessage *shortened, struct GNUNET_MESSENGER_Message *message)
-{
-  destroy_message_body (message->header.kind, &(message->body));
-
-  message->header.kind = shortened->kind;
-
-  GNUNET_memcpy(&(message->body), &(shortened->body), sizeof(struct GNUNET_MESSENGER_MessageBody));
-}
-
-#define member_size(type, member) sizeof(((type*) NULL)->member)
-
-static uint16_t
-get_message_body_kind_size (enum GNUNET_MESSENGER_MessageKind kind)
-{
-  uint16_t length = 0;
-
-  switch (kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.info.messenger_version);
-    break;
-  case GNUNET_MESSENGER_KIND_PEER:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.peer.peer);
-    break;
-  case GNUNET_MESSENGER_KIND_ID:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.id.id);
-    break;
-  case GNUNET_MESSENGER_KIND_MISS:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.miss.peer);
-    break;
-  case GNUNET_MESSENGER_KIND_MERGE:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.merge.previous);
-    break;
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.request.hash);
-    break;
-  case GNUNET_MESSENGER_KIND_INVITE:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.invite.door);
-    length += member_size(struct GNUNET_MESSENGER_Message, body.invite.key);
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.file.key);
-    length += member_size(struct GNUNET_MESSENGER_Message, body.file.hash);
-    length += member_size(struct GNUNET_MESSENGER_Message, body.file.name);
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    length += member_size(struct GNUNET_MESSENGER_Message, body.privacy.key);
-    break;
-  default:
-    break;
-  }
-
-  return length;
-}
-
-typedef uint32_t kind_t;
-
-uint16_t
-get_message_kind_size (enum GNUNET_MESSENGER_MessageKind kind)
-{
-  uint16_t length = 0;
-
-  length += member_size(struct GNUNET_MESSENGER_Message, header.timestamp);
-  length += member_size(struct GNUNET_MESSENGER_Message, header.sender_id);
-  length += member_size(struct GNUNET_MESSENGER_Message, header.previous);
-  length += sizeof(kind_t);
-
-  return length + get_message_body_kind_size (kind);
-}
-
-static uint16_t
-get_message_body_size (enum GNUNET_MESSENGER_MessageKind kind, const struct GNUNET_MESSENGER_MessageBody *body)
-{
-  uint16_t length = 0;
-
-  switch (kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO:
-    length += GNUNET_IDENTITY_key_get_length(&(body->info.host_key));
-    break;
-  case GNUNET_MESSENGER_KIND_JOIN:
-    length += GNUNET_IDENTITY_key_get_length(&(body->join.key));
-    break;
-  case GNUNET_MESSENGER_KIND_NAME:
-    length += (body->name.name ? strlen (body->name.name) : 0);
-    break;
-  case GNUNET_MESSENGER_KIND_KEY:
-    length += GNUNET_IDENTITY_key_get_length(&(body->key.key));
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    length += strlen (body->text.text);
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    length += strlen (body->file.uri);
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    length += body->privacy.length;
-    break;
-  default:
-    break;
-  }
-
-  return length;
-}
-
-uint16_t
-get_message_size (const struct GNUNET_MESSENGER_Message *message,
-                  int include_signature)
-{
-  GNUNET_assert(message);
-
-  uint16_t length = 0;
-
-  if (GNUNET_YES == include_signature)
-    length += GNUNET_IDENTITY_signature_get_length(&(message->header.signature));
-
-  length += get_message_kind_size (message->header.kind);
-  length += get_message_body_size (message->header.kind, &(message->body));
-
-  return length;
-}
-
-static uint16_t
-get_short_message_size (const struct GNUNET_MESSENGER_ShortMessage *message, int include_body)
-{
-  const uint16_t minimum_size = sizeof(struct GNUNET_HashCode) + sizeof(kind_t);
-
-  if (message)
-    return minimum_size + get_message_body_kind_size (message->kind)
-           + (include_body == GNUNET_YES? get_message_body_size (message->kind, &(message->body)) : 0);
-  else
-    return minimum_size;
-}
-
-static uint16_t
-calc_usual_padding ()
-{
-  uint16_t padding = 0;
-  uint16_t kind_size;
-
-  for (int i = 0; i <= GNUNET_MESSENGER_KIND_MAX; i++) {
-    kind_size = get_message_kind_size ((enum GNUNET_MESSENGER_MessageKind) i);
-
-    if (kind_size > padding)
-      padding = kind_size;
-  }
-
-  return padding + GNUNET_MESSENGER_PADDING_MIN;
-}
-
-#define max(x, y) (x > y? x : y)
-
-static uint16_t
-calc_padded_length (uint16_t length)
-{
-  static uint16_t usual_padding = 0;
-
-  if (!usual_padding)
-    usual_padding = calc_usual_padding();
-
-  const uint16_t padded_length = max(
-      length + GNUNET_MESSENGER_PADDING_MIN,
-      usual_padding
-  );
-
-  if (padded_length <= GNUNET_MESSENGER_PADDING_LEVEL0)
-    return GNUNET_MESSENGER_PADDING_LEVEL0;
-
-  if (padded_length <= GNUNET_MESSENGER_PADDING_LEVEL1)
-    return GNUNET_MESSENGER_PADDING_LEVEL1;
-
-  if (padded_length <= GNUNET_MESSENGER_PADDING_LEVEL2)
-    return GNUNET_MESSENGER_PADDING_LEVEL2;
-
-  return GNUNET_MESSENGER_MAX_MESSAGE_SIZE;
-
-}
-
-#define min(x, y) (x < y? x : y)
-
-#define encode_step_ext(dst, offset, src, size) do { \
-        GNUNET_memcpy(dst + offset, src, size);                        \
-        offset += size;                                                \
-} while (0)
-
-#define encode_step(dst, offset, src) do {         \
-  encode_step_ext(dst, offset, src, sizeof(*src)); \
-} while (0)
-
-#define encode_step_key(dst, offset, src, length) do {  \
-  ssize_t result = GNUNET_IDENTITY_write_key_to_buffer( \
-      src, dst + offset, length - offset                \
-  );                                                    \
-  if (result < 0)                                       \
-    GNUNET_break (0);                                   \
-  else                                                  \
-    offset += result;                                   \
-} while (0)
-
-#define encode_step_signature(dst, offset, src, length) do {  \
-  ssize_t result = GNUNET_IDENTITY_write_signature_to_buffer( \
-      src, dst + offset, length - offset                      \
-  );                                                          \
-  if (result < 0)                                             \
-    GNUNET_break (0);                                         \
-  else                                                        \
-    offset += result;                                         \
-} while (0)
-
-static void
-encode_message_body (enum GNUNET_MESSENGER_MessageKind kind, const struct GNUNET_MESSENGER_MessageBody *body,
-                     uint16_t length, char *buffer, uint16_t offset)
-{
-  uint32_t version;
-  switch (kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO:
-    version = GNUNET_htobe32(body->info.messenger_version);
-
-    encode_step_key(buffer, offset, &(body->info.host_key), length);
-    encode_step(buffer, offset, &version);
-    break;
-  case GNUNET_MESSENGER_KIND_JOIN:
-    encode_step_key(buffer, offset, &(body->join.key), length);
-    break;
-  case GNUNET_MESSENGER_KIND_NAME:
-    if (body->name.name)
-      encode_step_ext(buffer, offset, body->name.name, min(length - offset, strlen(body->name.name)));
-    break;
-  case GNUNET_MESSENGER_KIND_KEY:
-    encode_step_key(buffer, offset, &(body->key.key), length);
-    break;
-  case GNUNET_MESSENGER_KIND_PEER:
-    encode_step(buffer, offset, &(body->peer.peer));
-    break;
-  case GNUNET_MESSENGER_KIND_ID:
-    encode_step(buffer, offset, &(body->id.id));
-    break;
-  case GNUNET_MESSENGER_KIND_MISS:
-    encode_step(buffer, offset, &(body->miss.peer));
-    break;
-  case GNUNET_MESSENGER_KIND_MERGE:
-    encode_step(buffer, offset, &(body->merge.previous));
-    break;
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    encode_step(buffer, offset, &(body->request.hash));
-    break;
-  case GNUNET_MESSENGER_KIND_INVITE:
-    encode_step(buffer, offset, &(body->invite.door));
-    encode_step(buffer, offset, &(body->invite.key));
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    encode_step_ext(buffer, offset, body->text.text, min(length - offset, strlen(body->text.text)));
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    encode_step(buffer, offset, &(body->file.key));
-    encode_step(buffer, offset, &(body->file.hash));
-    encode_step_ext(buffer, offset, body->file.name, sizeof(body->file.name));
-    encode_step_ext(buffer, offset, body->file.uri, min(length - offset, strlen(body->file.uri)));
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    encode_step(buffer, offset, &(body->privacy.key));
-    encode_step_ext(buffer, offset, body->privacy.data, min(length - offset, body->privacy.length));
-    break;
-  default:
-    break;
-  }
-
-  if (offset >= length)
-    return;
-
-  const uint16_t padding = length - offset;
-  const uint16_t used_padding = sizeof(padding) + sizeof(char);
-
-  GNUNET_assert(padding >= used_padding);
-
-  buffer[offset++] = '\0';
-
-  if (padding > used_padding)
-    GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, buffer + offset, padding - used_padding);
-
-  GNUNET_memcpy(buffer + length - sizeof(padding), &padding, sizeof(padding));
-}
-
-void
-encode_message (const struct GNUNET_MESSENGER_Message *message, uint16_t length, char *buffer,
-                int include_signature)
-{
-  GNUNET_assert((message) && (buffer));
-
-  uint16_t offset = 0;
-
-  if (GNUNET_YES == include_signature)
-    encode_step_signature(buffer, offset, &(message->header.signature), length);
-
-  const kind_t kind = GNUNET_htobe32((kind_t) message->header.kind);
-
-  encode_step(buffer, offset, &(message->header.timestamp));
-  encode_step(buffer, offset, &(message->header.sender_id));
-  encode_step(buffer, offset, &(message->header.previous));
-  encode_step(buffer, offset, &kind);
-
-  encode_message_body (message->header.kind, &(message->body), length, buffer, offset);
-}
-
-static void
-encode_short_message (const struct GNUNET_MESSENGER_ShortMessage *message, uint16_t length, char *buffer)
-{
-  struct GNUNET_HashCode hash;
-  uint16_t offset = sizeof(hash);
-
-  const kind_t kind = GNUNET_htobe32((kind_t) message->kind);
-
-  encode_step(buffer, offset, &kind);
-
-  encode_message_body (message->kind, &(message->body), length, buffer, offset);
-
-  GNUNET_CRYPTO_hash(
-      buffer + sizeof(hash),
-      length - sizeof(hash),
-      &hash
-  );
-
-  GNUNET_memcpy(buffer, &hash, sizeof(hash));
-}
-
-#define decode_step_ext(src, offset, dst, size) do { \
-        GNUNET_memcpy(dst, src + offset, size);                              \
-        offset += size;                                                      \
-} while (0)
-
-#define decode_step(src, offset, dst) do {                               \
-  decode_step_ext(src, offset, dst, sizeof(*dst)); \
-} while (0)
-
-#define decode_step_malloc(src, offset, dst, size, zero) do {   \
-        dst = GNUNET_malloc(size + zero);                           \
-  if (zero) dst[size] = 0;                                                                                        \
-        decode_step_ext(src, offset, dst, size);                                                  \
-} while (0)
-
-#define decode_step_key(src, offset, dst, length) do {   \
-  ssize_t result = GNUNET_IDENTITY_read_key_from_buffer( \
-    dst, src + offset, length - offset                   \
-  );                                                     \
-  if (result < 0)                                        \
-    GNUNET_break(0);                                     \
-  else                                                   \
-    offset += result;                                    \
-} while (0)
-
-static uint16_t
-decode_message_body (enum GNUNET_MESSENGER_MessageKind *kind, struct GNUNET_MESSENGER_MessageBody *body,
-                     uint16_t length, const char *buffer, uint16_t offset)
-{
-  uint16_t padding = 0;
-
-  GNUNET_memcpy(&padding, buffer + length - sizeof(padding), sizeof(padding));
-
-  if (padding > length - offset)
-    padding = 0;
-
-  const uint16_t end_zero = length - padding;
-
-  if ((padding) && (buffer[end_zero] != '\0'))
-    padding = 0;
-
-  length -= padding;
-
-  uint32_t version;
-  switch (*kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO: {
-    decode_step_key(buffer, offset, &(body->info.host_key), length);
-    decode_step(buffer, offset, &version);
-
-    body->info.messenger_version = GNUNET_be32toh(version);
-    break;
-  } case GNUNET_MESSENGER_KIND_JOIN: {
-    decode_step_key(buffer, offset, &(body->join.key), length);
-    break;
-  } case GNUNET_MESSENGER_KIND_NAME:
-    if (length - offset > 0)
-      decode_step_malloc(buffer, offset, body->name.name, length - offset, 1);
-    else
-      body->name.name = NULL;
-    break;
-  case GNUNET_MESSENGER_KIND_KEY:
-    decode_step_key(buffer, offset, &(body->key.key), length);
-    break;
-  case GNUNET_MESSENGER_KIND_PEER:
-    decode_step(buffer, offset, &(body->peer.peer));
-    break;
-  case GNUNET_MESSENGER_KIND_ID:
-    decode_step(buffer, offset, &(body->id.id));
-    break;
-  case GNUNET_MESSENGER_KIND_MISS:
-    decode_step(buffer, offset, &(body->miss.peer));
-    break;
-  case GNUNET_MESSENGER_KIND_MERGE:
-    decode_step(buffer, offset, &(body->merge.previous));
-    break;
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    decode_step(buffer, offset, &(body->request.hash));
-    break;
-  case GNUNET_MESSENGER_KIND_INVITE:
-    decode_step(buffer, offset, &(body->invite.door));
-    decode_step(buffer, offset, &(body->invite.key));
-    break;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    decode_step_malloc(buffer, offset, body->text.text, length - offset, 1);
-    break;
-  case GNUNET_MESSENGER_KIND_FILE:
-    decode_step(buffer, offset, &(body->file.key));
-    decode_step(buffer, offset, &(body->file.hash));
-    decode_step_ext(buffer, offset, body->file.name, sizeof(body->file.name));
-    decode_step_malloc(buffer, offset, body->file.uri, length - offset, 1);
-    break;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    decode_step(buffer, offset, &(body->privacy.key));
-
-    body->privacy.length = (length - offset);
-    decode_step_malloc(buffer, offset, body->privacy.data, length - offset, 0);
-    break;
-  default:
-    *kind = GNUNET_MESSENGER_KIND_UNKNOWN;
-    break;
-  }
-
-  return padding;
-}
-
-int
-decode_message (struct GNUNET_MESSENGER_Message *message, uint16_t length, const char *buffer,
-                int include_signature, uint16_t *padding)
-{
-  GNUNET_assert((message) && (buffer) && (length >= get_message_kind_size(GNUNET_MESSENGER_KIND_UNKNOWN)));
-
-  uint16_t offset = 0;
-
-  if (GNUNET_YES == include_signature)
-  {
-    ssize_t result = GNUNET_IDENTITY_read_signature_from_buffer(
-        &(message->header.signature), buffer, length - offset
-    );
-
-    if (result < 0)
-      return GNUNET_NO;
-    else
-      offset += result;
-  }
-
-  const uint16_t count = length - offset;
-
-  if (count < get_message_kind_size (GNUNET_MESSENGER_KIND_UNKNOWN))
-    return GNUNET_NO;
-
-  kind_t kind;
-
-  decode_step(buffer, offset, &(message->header.timestamp));
-  decode_step(buffer, offset, &(message->header.sender_id));
-  decode_step(buffer, offset, &(message->header.previous));
-  decode_step(buffer, offset, &kind);
-
-  message->header.kind = (enum GNUNET_MESSENGER_MessageKind) GNUNET_be32toh(kind);
-
-  if (count < get_message_kind_size (message->header.kind))
-    return GNUNET_NO;
-
-  const uint16_t result = decode_message_body (&(message->header.kind), &(message->body), length, buffer, offset);
-
-  if (padding)
-    *padding = result;
-
-  return GNUNET_YES;
-}
-
-static int
-decode_short_message (struct GNUNET_MESSENGER_ShortMessage *message, uint16_t length, const char *buffer)
-{
-  struct GNUNET_HashCode expected, hash;
-  uint16_t offset = sizeof(hash);
-
-  if (length < get_short_message_size (NULL, GNUNET_NO))
-    return GNUNET_NO;
-
-  GNUNET_memcpy(&hash, buffer, sizeof(hash));
-
-  GNUNET_CRYPTO_hash(
-      buffer + sizeof(hash),
-      length - sizeof(hash),
-      &expected
-  );
-
-  if (0 != GNUNET_CRYPTO_hash_cmp(&hash, &expected))
-    return GNUNET_NO;
-
-  kind_t kind;
-
-  decode_step(buffer, offset, &kind);
-
-  message->kind = (enum GNUNET_MESSENGER_MessageKind) GNUNET_be32toh(kind);
-
-  if (length < get_short_message_size (message, GNUNET_NO))
-    return GNUNET_NO;
-
-  decode_message_body (&(message->kind), &(message->body), length, buffer, offset);
-
-  if (GNUNET_MESSENGER_KIND_UNKNOWN == message->kind)
-    return GNUNET_NO;
-
-  return GNUNET_YES;
-}
-
-void
-hash_message (const struct GNUNET_MESSENGER_Message *message, uint16_t length, const char *buffer,
-              struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((message) && (buffer) && (hash));
-
-  const ssize_t offset = GNUNET_IDENTITY_signature_get_length(
-      &(message->header.signature)
-  );
-
-  GNUNET_CRYPTO_hash (buffer + offset, length - offset, hash);
-}
-
-void
-sign_message (struct GNUNET_MESSENGER_Message *message, uint16_t length, char *buffer,
-              const struct GNUNET_HashCode *hash, const struct GNUNET_MESSENGER_Ego *ego)
-{
-  GNUNET_assert((message) && (buffer) && (hash) && (ego));
-
-  struct GNUNET_MESSENGER_MessageSignature signature;
-
-  signature.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE);
-  signature.purpose.size = htonl (sizeof(signature));
-
-  GNUNET_memcpy(&(signature.hash), hash, sizeof(struct GNUNET_HashCode));
-  GNUNET_IDENTITY_sign(&(ego->priv), &signature, &(message->header.signature));
-
-  uint16_t offset = 0;
-  encode_step_signature(buffer, offset, &(message->header.signature), length);
-}
-
-int
-verify_message (const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash,
-                const struct GNUNET_IDENTITY_PublicKey *key)
-{
-  GNUNET_assert((message) && (hash) && (key));
-
-  if (ntohl (key->type) != ntohl (message->header.signature.type))
-    return GNUNET_SYSERR;
-
-  struct GNUNET_MESSENGER_MessageSignature signature;
-
-  signature.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE);
-  signature.purpose.size = htonl (sizeof(signature));
-
-  GNUNET_memcpy(&(signature.hash), hash, sizeof(struct GNUNET_HashCode));
-
-  return GNUNET_IDENTITY_signature_verify(GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE, &signature,
-                                          &(message->header.signature), key);
-}
-
-int
-encrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_IDENTITY_PublicKey *key)
-{
-  GNUNET_assert((message) && (key));
-
-  struct GNUNET_MESSENGER_ShortMessage shortened;
-
-  fold_short_message (message, &shortened);
-
-  const uint16_t length = get_short_message_size (&shortened, GNUNET_YES);
-  const uint16_t padded_length = calc_padded_length(length);
-
-  message->header.kind = GNUNET_MESSENGER_KIND_PRIVATE;
-  message->body.privacy.data = GNUNET_malloc(padded_length);
-  message->body.privacy.length = padded_length;
-
-  encode_short_message (&shortened, padded_length, message->body.privacy.data);
-
-  if (padded_length == GNUNET_IDENTITY_encrypt (message->body.privacy.data, padded_length, key,
-                                                &(message->body.privacy.key),
-                                                message->body.privacy.data))
-  {
-    destroy_message_body (shortened.kind, &(shortened.body));
-    return GNUNET_YES;
-  }
-  else
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Encrypting message failed!\n");
-
-    unfold_short_message (&shortened, message);
-    return GNUNET_NO;
-  }
-}
-
-int
-decrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_IDENTITY_PrivateKey *key)
-{
-  GNUNET_assert((message) && (key));
-
-  if (message->body.privacy.length != GNUNET_IDENTITY_decrypt (message->body.privacy.data, message->body.privacy.length,
-                                                               key, &(message->body.privacy.key),
-                                                               message->body.privacy.data))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decrypting message failed!\n");
-
-    return GNUNET_NO;
-  }
-
-  struct GNUNET_MESSENGER_ShortMessage shortened;
-
-  if (GNUNET_YES != decode_short_message (&shortened, message->body.privacy.length, message->body.privacy.data))
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decoding decrypted message failed!\n");
-
-    return GNUNET_NO;
-  }
-
-  unfold_short_message (&shortened, message);
-
-  return GNUNET_YES;
-}
-
-struct GNUNET_MQ_Envelope*
-pack_message (struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash,
-              const struct GNUNET_MESSENGER_Ego *ego, int mode)
-{
-  GNUNET_assert(message);
-
-  if (ego)
-    message->header.signature.type = ego->priv.type;
-
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Packing message kind=%u and sender: %s\n",
-             message->header.kind, GNUNET_sh2s(&(message->header.sender_id)));
-
-  struct GNUNET_MessageHeader *header;
-
-  const uint16_t length = get_message_size (message, GNUNET_YES);
-  const uint16_t padded_length = calc_padded_length(length);
-
-  struct GNUNET_MQ_Envelope *env;
-  char *buffer;
-
-  if (GNUNET_MESSENGER_PACK_MODE_ENVELOPE == mode)
-  {
-    env = GNUNET_MQ_msg_extra(header, padded_length, GNUNET_MESSAGE_TYPE_CADET_CLI);
-
-    buffer = (char*) &(header[1]);
-  }
-  else
-  {
-    env = NULL;
-
-    buffer = GNUNET_malloc(padded_length);
-  }
-
-  encode_message (message, padded_length, buffer, GNUNET_YES);
-
-  if (hash)
-  {
-    hash_message (message, length, buffer, hash);
-
-    if (ego)
-      sign_message (message, length, buffer, hash, ego);
-  }
-
-  if (GNUNET_MESSENGER_PACK_MODE_ENVELOPE != mode)
-    GNUNET_free(buffer);
-
-  return env;
-}
-
-int
-filter_message_sending (const struct GNUNET_MESSENGER_Message *message)
-{
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_INFO:
-    return GNUNET_SYSERR; // Reserved for connection handling only!
-  case GNUNET_MESSENGER_KIND_JOIN:
-    return GNUNET_NO; // Use #GNUNET_MESSENGER_enter_room(...) instead!
-  case GNUNET_MESSENGER_KIND_LEAVE:
-    return GNUNET_NO; // Use #GNUNET_MESSENGER_close_room(...) instead!
-  case GNUNET_MESSENGER_KIND_NAME:
-    return GNUNET_YES;
-  case GNUNET_MESSENGER_KIND_KEY:
-    return GNUNET_NO; // Use #GNUNET_MESSENGER_update(...) instead!
-  case GNUNET_MESSENGER_KIND_PEER:
-    return GNUNET_NO; // Use #GNUNET_MESSENGER_open_room(...) instead!
-  case GNUNET_MESSENGER_KIND_ID:
-    return GNUNET_SYSERR; // Reserved for member id handling only!
-  case GNUNET_MESSENGER_KIND_MISS:
-    return GNUNET_SYSERR; // Reserved for connection handling only!
-  case GNUNET_MESSENGER_KIND_MERGE:
-    return GNUNET_YES;
-  case GNUNET_MESSENGER_KIND_REQUEST:
-    return GNUNET_YES;
-  case GNUNET_MESSENGER_KIND_INVITE:
-    return GNUNET_YES;
-  case GNUNET_MESSENGER_KIND_TEXT:
-    return GNUNET_YES;
-  case GNUNET_MESSENGER_KIND_FILE:
-    return GNUNET_YES;
-  case GNUNET_MESSENGER_KIND_PRIVATE:
-    return GNUNET_NO; // Use #GNUNET_MESSENGER_send_message(...) with a contact instead!
-  case GNUNET_MESSENGER_KIND_DELETE:
-    return GNUNET_YES;
-  default:
-    return GNUNET_SYSERR;
-  }
-}
diff --git a/src/messenger/messenger_api_message.h b/src/messenger/messenger_api_message.h
deleted file mode 100644
index 7ce30dc92..000000000
--- a/src/messenger/messenger_api_message.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_message.h
- * @brief messenger api: client and service implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_MESSAGE_H
-#define GNUNET_MESSENGER_API_MESSAGE_H
-
-#include "platform.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_mq_lib.h"
-#include "gnunet_signatures.h"
-
-#include "gnunet_messenger_service.h"
-
-#include "messenger_api_ego.h"
-
-#define GNUNET_MESSENGER_MAX_MESSAGE_SIZE (GNUNET_MAX_MESSAGE_SIZE - GNUNET_MIN_MESSAGE_SIZE)
-
-#define GNUNET_MESSENGER_PADDING_MIN (sizeof(uint16_t) + sizeof(char))
-#define GNUNET_MESSENGER_PADDING_LEVEL0 (512)
-#define GNUNET_MESSENGER_PADDING_LEVEL1 (4096)
-#define GNUNET_MESSENGER_PADDING_LEVEL2 (32768)
-
-/**
- * Creates and allocates a new message with a specific <i>kind</i>.
- *
- * @param[in] kind Kind of message
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-create_message (enum GNUNET_MESSENGER_MessageKind kind);
-
-/**
- * Creates and allocates a copy of a given <i>message</i>.
- *
- * @param[in] message Message
- * @return New message
- */
-struct GNUNET_MESSENGER_Message*
-copy_message (const struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Destroys a message and frees its memory fully.
- *
- * @param[in/out] message Message
- */
-void
-destroy_message (struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Returns if the message should be bound to a member session.
- *
- * @param[in] message Message
- * @return #GNUNET_YES or #GNUNET_NO
- */
-int
-is_message_session_bound (const struct GNUNET_MESSENGER_Message *message);
-
-/**
- * Returns the minimal size in bytes to encode a message of a specific <i>kind</i>.
- *
- * @param[in] kind Kind of message
- * @return Minimal size to encode
- */
-uint16_t
-get_message_kind_size (enum GNUNET_MESSENGER_MessageKind kind);
-
-/**
- * Returns the exact size in bytes to encode a given <i>message</i>.
- *
- * @param[in] message Message
- * @param[in] encode_signature Flag to include signature
- * @return Size to encode
- */
-uint16_t
-get_message_size (const struct GNUNET_MESSENGER_Message *message,
-                  int include_signature);
-
-/**
- * Encodes a given <i>message</i> into a <i>buffer</i> of a maximal <i>length</i> in bytes.
- *
- * @param[in] message Message
- * @param[in] length Maximal length to encode
- * @param[out] buffer Buffer
- * @param[in] encode_signature Flag to include signature
- */
-void
-encode_message (const struct GNUNET_MESSENGER_Message *message, uint16_t length, char *buffer,
-                int include_signature);
-
-/**
- * Decodes a <i>message</i> from a given <i>buffer</i> of a maximal <i>length</i> in bytes.
- *
- * If the buffer is too small for a message of its decoded kind the function fails with
- * resulting #GNUNET_NO after decoding only the messages header.
- *
- * On success the function returns #GNUNET_YES.
- *
- * @param[out] message Message
- * @param[in] length Maximal length to decode
- * @param[in] buffer Buffer
- * @param[out] padding Padding
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-decode_message (struct GNUNET_MESSENGER_Message *message, uint16_t length, const char *buffer,
-                int include_signature, uint16_t *padding);
-
-/**
- * Calculates a <i>hash</i> of a given <i>buffer</i> with a <i>length</i> in bytes
- * from a <i>message</i>.
- *
- * @param[in] message Message
- * @param[in] length Length of buffer
- * @param[in] buffer Buffer
- * @param[out] hash Hash
- */
-void
-hash_message (const struct GNUNET_MESSENGER_Message *message, uint16_t length, const char *buffer,
-              struct GNUNET_HashCode *hash);
-
-/**
- * Signs the <i>hash</i> of a <i>message</i> with a given <i>ego</i> and writes the signature
- * into the <i>buffer</i> as well.
- *
- * @param[in/out] message Message
- * @param[in] length Length of buffer
- * @param[out] buffer Buffer
- * @param[in] hash Hash of message
- * @param[in] ego EGO
- */
-void
-sign_message (struct GNUNET_MESSENGER_Message *message, uint16_t length, char *buffer,
-              const struct GNUNET_HashCode *hash, const struct GNUNET_MESSENGER_Ego *ego);
-
-/**
- * Verifies the signature of a given <i>message</i> and its <i>hash</i> with a specific
- * public key. The function returns #GNUNET_OK if the signature was valid, otherwise
- * #GNUNET_SYSERR.
- *
- * @param[in] message Message
- * @param[in] hash Hash of message
- * @param[in] key Public key of EGO
- * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
- */
-int
-verify_message (const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash,
-                const struct GNUNET_IDENTITY_PublicKey *key);
-
-/**
- * Encrypts a <i>message</i> using a given public <i>key</i> and replaces its body
- * and kind with the now private encrypted <i>message</i>. The function returns
- * #GNUNET_YES if the operation succeeded, otherwise #GNUNET_NO.
- *
- * @param[in/out] message Message
- * @param[in] key Public key of EGO
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-encrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_IDENTITY_PublicKey *key);
-
-/**
- * Decrypts a private <i>message</i> using a given private <i>key</i> and replaces its body
- * and kind with the inner encrypted message. The function returns #GNUNET_YES if the
- * operation succeeded, otherwise #GNUNET_NO.
- *
- * @param[in/out] message Message
- * @param[in] key Private key of EGO
- * @return #GNUNET_YES on success, otherwise #GNUNET_NO
- */
-int
-decrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_IDENTITY_PrivateKey *key);
-
-#define GNUNET_MESSENGER_PACK_MODE_ENVELOPE 0x1
-#define GNUNET_MESSENGER_PACK_MODE_UNKNOWN 0x0
-
-/**
- * Encodes the <i>message</i> to pack it into a newly allocated envelope if <i>mode</i>
- * is equal to #GNUNET_MESSENGER_PACK_MODE_ENVELOPE. Independent of the mode the message
- * will be hashed if <i>hash</i> is not NULL and it will be signed if the <i>ego</i> is
- * not NULL.
- *
- * @param[out] message Message
- * @param[out] hash Hash of message
- * @param[in] ego EGO to sign
- * @param[in] mode Mode of packing
- * @return Envelope or NULL
- */
-struct GNUNET_MQ_Envelope*
-pack_message (struct GNUNET_MESSENGER_Message *message, struct GNUNET_HashCode *hash,
-              const struct GNUNET_MESSENGER_Ego *ego, int mode);
-
-/**
- * Returns if a specific kind of message should be sent by a client. The function returns
- * #GNUNET_YES or #GNUNET_NO for recommendations and #GNUNET_SYSERR for specific kinds
- * of messages which should not be sent manually at all.
- *
- * @param[in] message Message
- */
-int
-filter_message_sending (const struct GNUNET_MESSENGER_Message *message);
-
-#endif //GNUNET_MESSENGER_API_MESSAGE_H
diff --git a/src/messenger/messenger_api_room.c b/src/messenger/messenger_api_room.c
deleted file mode 100644
index 0d9237a2e..000000000
--- a/src/messenger/messenger_api_room.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_room.c
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_room.h"
-
-#include "messenger_api_handle.h"
-
-struct GNUNET_MESSENGER_Room*
-create_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key)
-{
-  GNUNET_assert((handle) && (key));
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_new(struct GNUNET_MESSENGER_Room);
-
-  room->handle = handle;
-  GNUNET_memcpy(&(room->key), key, sizeof(*key));
-
-  room->opened = GNUNET_NO;
-  room->contact_id = NULL;
-
-  init_list_tunnels (&(room->entries));
-
-  room->messages = GNUNET_CONTAINER_multihashmap_create (8, GNUNET_NO);
-  room->members = GNUNET_CONTAINER_multishortmap_create (8, GNUNET_NO);
-
-  return room;
-}
-
-static int
-iterate_destroy_message (void *cls, const struct GNUNET_HashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = value;
-
-  destroy_message (entry->message);
-  GNUNET_free(entry);
-
-  return GNUNET_YES;
-}
-
-void
-destroy_room (struct GNUNET_MESSENGER_Room *room)
-{
-  GNUNET_assert(room);
-
-  clear_list_tunnels (&(room->entries));
-
-  if (room->messages)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (room->messages, iterate_destroy_message, NULL);
-
-    GNUNET_CONTAINER_multihashmap_destroy (room->messages);
-  }
-
-  if (room->members)
-    GNUNET_CONTAINER_multishortmap_destroy (room->members);
-
-  if (room->contact_id)
-    GNUNET_free(room->contact_id);
-
-  GNUNET_free(room);
-}
-
-const struct GNUNET_MESSENGER_Message*
-get_room_message (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((room) && (hash));
-
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
-      room->messages, hash
-  );
-
-  return (entry? entry->message : NULL);
-}
-
-struct GNUNET_MESSENGER_Contact*
-get_room_sender (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash)
-{
-  GNUNET_assert((room) && (hash));
-
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
-      room->messages, hash
-  );
-
-  return (entry? entry->sender : NULL);
-}
-
-static struct GNUNET_MESSENGER_Contact*
-handle_join_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if (!sender)
-  {
-    struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
-    struct GNUNET_HashCode context;
-
-    get_context_from_member(&(room->key), &(message->header.sender_id), &context);
-
-    sender = get_store_contact(store, &context, &(message->body.join.key));
-  }
-
-  if ((GNUNET_YES != GNUNET_CONTAINER_multishortmap_contains_value(room->members, &(message->header.sender_id), sender)) &&
-      (GNUNET_OK == GNUNET_CONTAINER_multishortmap_put(room->members, &(message->header.sender_id), sender,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
-    increase_contact_rc(sender);
-
-  return sender;
-}
-
-static void
-handle_leave_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                      const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if ((!sender) ||
-      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove(room->members, &(message->header.sender_id), sender)))
-    return;
-
-  struct GNUNET_HashCode context;
-  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
-
-  if (GNUNET_YES == decrease_contact_rc(sender))
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "A contact does not share any room with you anymore!\n");
-}
-
-static void
-handle_name_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if (!sender)
-    return;
-
-  set_contact_name (sender, message->body.name.name);
-}
-
-static void
-handle_key_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                    const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if (!sender)
-    return;
-
-  struct GNUNET_HashCode context;
-  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
-
-  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
-
-  update_store_contact(store, sender, &context, &context, &(message->body.key.key));
-}
-
-static void
-handle_id_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                   const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if ((!sender) ||
-      (GNUNET_YES != GNUNET_CONTAINER_multishortmap_remove(room->members, &(message->header.sender_id), sender)) ||
-      (GNUNET_OK != GNUNET_CONTAINER_multishortmap_put(room->members, &(message->body.id.id), sender,
-                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)))
-    return;
-
-  struct GNUNET_HashCode context, next_context;
-  get_context_from_member(&(room->key), &(message->header.sender_id), &context);
-  get_context_from_member(&(room->key), &(message->body.id.id), &next_context);
-
-  struct GNUNET_MESSENGER_ContactStore *store = get_handle_contact_store(room->handle);
-
-  update_store_contact(store, sender, &context, &next_context, get_contact_key(sender));
-}
-
-static void
-handle_miss_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if ((room->contact_id) && (0 == GNUNET_memcmp(&(message->header.sender_id), room->contact_id)))
-  {
-    struct GNUNET_MESSENGER_ListTunnel *match = find_list_tunnels (&(room->entries), &(message->body.miss.peer), NULL);
-
-    if (match)
-      remove_from_list_tunnels (&(room->entries), match);
-  }
-}
-
-static void
-handle_delete_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_CONTAINER_multihashmap_get (
-      room->messages, &(message->body.deletion.hash)
-  );
-
-  if ((entry) && ((entry->sender == sender) || (get_handle_contact (room->handle, &(room->key)) == sender)) &&
-      (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (room->messages, &(message->body.deletion.hash), entry)))
-  {
-    destroy_message (entry->message);
-    GNUNET_free(entry);
-  }
-}
-
-struct GNUNET_MESSENGER_Contact*
-handle_room_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash)
-{
-  if (GNUNET_NO != GNUNET_CONTAINER_multihashmap_contains (room->messages, hash))
-    return sender;
-
-  switch (message->header.kind)
-  {
-  case GNUNET_MESSENGER_KIND_JOIN:
-    sender = handle_join_message (room, sender, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_LEAVE:
-    handle_leave_message (room, sender, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_NAME:
-    handle_name_message (room, sender, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_KEY:
-    handle_key_message (room, sender, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_ID:
-    handle_id_message (room, sender, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_MISS:
-    handle_miss_message (room, sender, message, hash);
-    break;
-  case GNUNET_MESSENGER_KIND_DELETE:
-    handle_delete_message (room, sender, message, hash);
-    break;
-  default:
-    break;
-  }
-
-  struct GNUNET_MESSENGER_RoomMessageEntry *entry = GNUNET_new(struct GNUNET_MESSENGER_RoomMessageEntry);
-
-  if (!entry)
-    return sender;
-
-  entry->sender = sender;
-  entry->message = copy_message (message);
-
-  if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (room->messages, hash, entry,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
-  {
-    destroy_message (entry->message);
-    GNUNET_free(entry);
-  }
-
-  return sender;
-}
-
-struct GNUNET_MESSENGER_MemberCall
-{
-  struct GNUNET_MESSENGER_Room *room;
-  GNUNET_MESSENGER_MemberCallback callback;
-  void *cls;
-};
-
-static int
-iterate_local_members (void* cls, const struct GNUNET_ShortHashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MemberCall *call = cls;
-  struct GNUNET_MESSENGER_Contact *contact = value;
-
-  return call->callback(call->cls, call->room, contact);
-}
-
-int
-iterate_room_members (struct GNUNET_MESSENGER_Room *room, GNUNET_MESSENGER_MemberCallback callback,
-                      void* cls)
-{
-  GNUNET_assert(room);
-
-  if (!callback)
-    return GNUNET_CONTAINER_multishortmap_iterate(room->members, NULL, NULL);
-
-  struct GNUNET_MESSENGER_MemberCall call;
-
-  call.room = room;
-  call.callback = callback;
-  call.cls = cls;
-
-  GNUNET_assert(callback);
-
-  return GNUNET_CONTAINER_multishortmap_iterate(room->members, iterate_local_members, &call);
-}
-
-struct GNUNET_MESSENGER_MemberFind
-{
-  const struct GNUNET_MESSENGER_Contact *contact;
-  int result;
-};
-
-static int
-iterate_find_member (void* cls, const struct GNUNET_ShortHashCode *key, void *value)
-{
-  struct GNUNET_MESSENGER_MemberFind *find = cls;
-  struct GNUNET_MESSENGER_Contact *contact = value;
-
-  if (contact == find->contact)
-  {
-    find->result = GNUNET_YES;
-    return GNUNET_NO;
-  }
-
-  return GNUNET_YES;
-}
-
-int
-find_room_member (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Contact *contact)
-{
-  GNUNET_assert(room);
-
-  struct GNUNET_MESSENGER_MemberFind find;
-
-  find.contact = contact;
-  find.result = GNUNET_NO;
-
-  GNUNET_CONTAINER_multishortmap_iterate(room->members, iterate_find_member, &find);
-
-  return find.result;
-}
diff --git a/src/messenger/messenger_api_room.h b/src/messenger/messenger_api_room.h
deleted file mode 100644
index 634052272..000000000
--- a/src/messenger/messenger_api_room.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_room.h
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_MESSENGER_API_ROOM_H
-#define GNUNET_MESSENGER_API_ROOM_H
-
-#include "platform.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-
-#include "gnunet_messenger_service.h"
-
-#include "messenger_api_list_tunnels.h"
-#include "messenger_api_contact.h"
-#include "messenger_api_message.h"
-
-struct GNUNET_MESSENGER_RoomMessageEntry {
-  struct GNUNET_MESSENGER_Contact* sender;
-  struct GNUNET_MESSENGER_Message* message;
-};
-
-struct GNUNET_MESSENGER_Room
-{
-  struct GNUNET_MESSENGER_Handle *handle;
-  struct GNUNET_HashCode key;
-
-  int opened;
-
-  struct GNUNET_ShortHashCode *contact_id;
-
-  struct GNUNET_MESSENGER_ListTunnels entries;
-
-  struct GNUNET_CONTAINER_MultiHashMap *messages;
-  struct GNUNET_CONTAINER_MultiShortmap *members;
-};
-
-/**
- * Creates and allocates a new room for a <i>handle</i> with a given <i>key</i> for the client API.
- *
- * @param[in/out] handle Handle
- * @param[in] key Key of room
- * @return New room
- */
-struct GNUNET_MESSENGER_Room*
-create_room (struct GNUNET_MESSENGER_Handle *handle, const struct GNUNET_HashCode *key);
-
-/**
- * Destroys a room and frees its memory fully from the client API.
- *
- * @param[in/out] room Room
- */
-void
-destroy_room (struct GNUNET_MESSENGER_Room *room);
-
-/**
- * Returns a message locally stored from a map for a given <i>hash</i> in a <i>room</i>. If no matching
- * message is found, NULL gets returned.
- *
- * @param[in] room Room
- * @param[in] hash Hash of message
- * @return Message or NULL
- */
-const struct GNUNET_MESSENGER_Message*
-get_room_message (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash);
-
-/**
- * Returns a messages sender locally stored from a map for a given <i>hash</i> in a <i>room</i>. If no
- * matching message is found, NULL gets returned.
- *
- * @param[in] room Room
- * @param[in] hash Hash of message
- * @return Contact of sender or NULL
- */
-struct GNUNET_MESSENGER_Contact*
-get_room_sender (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_HashCode *hash);
-
-/**
- * Handles a <i>message</i> with a given <i>hash</i> in a <i>room</i> for the client API to update
- * members and its information. The function also stores the message in map locally for access afterwards.
- *
- * The contact of the message's sender could be updated or even created. It may not be freed or destroyed though!
- * (The contact may still be in use for old messages...)
- *
- * @param[in/out] room Room
- * @param[in/out] sender Contact of sender
- * @param[in] message Message
- * @param[in] hash Hash of message
- * @return Contact of sender
- */
-struct GNUNET_MESSENGER_Contact*
-handle_room_message (struct GNUNET_MESSENGER_Room *room, struct GNUNET_MESSENGER_Contact *sender,
-                     const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash);
-
-/**
- * Iterates through all members of a given <i>room</i> to forward each of them to a selected
- * <i>callback</i> with a custom closure.
- *
- * @param[in/out] room Room
- * @param[in] callback Function called for each member
- * @param[in/out] cls Closure
- * @return Amount of members iterated
- */
-int
-iterate_room_members (struct GNUNET_MESSENGER_Room *room, GNUNET_MESSENGER_MemberCallback callback,
-                      void* cls);
-
-/**
- * Checks through all members of a given <i>room</i> if a specific <i>contact</i> is found and
- * returns a result depending on that.
- *
- * @param[in] room Room
- * @param[in] contact
- * @return #GNUNET_YES if found, otherwise #GNUNET_NO
- */
-int
-find_room_member (const struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Contact *contact);
-
-#endif //GNUNET_MESSENGER_API_ROOM_H
diff --git a/src/messenger/messenger_api_util.c b/src/messenger/messenger_api_util.c
deleted file mode 100644
index 4ad00c45e..000000000
--- a/src/messenger/messenger_api_util.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_util.c
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#include "messenger_api_util.h"
-
-static void
-callback_close_channel (void *cls)
-{
-  struct GNUNET_CADET_Channel *channel = cls;
-
-  if (channel)
-    GNUNET_CADET_channel_destroy (channel);
-}
-
-void
-delayed_disconnect_channel (struct GNUNET_CADET_Channel *channel)
-{
-  GNUNET_assert(channel);
-
-  GNUNET_SCHEDULER_add_delayed_with_priority (GNUNET_TIME_relative_get_zero_ (),
-                                              GNUNET_SCHEDULER_PRIORITY_URGENT,
-                                              callback_close_channel, channel);
-}
-
-int
-generate_free_member_id (struct GNUNET_ShortHashCode *id, const struct GNUNET_CONTAINER_MultiShortmap *members)
-{
-  GNUNET_assert(id);
-
-  size_t counter = 1 + (members ? GNUNET_CONTAINER_multishortmap_size (members) : 0);
-
-  do
-  {
-    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG, id, sizeof(struct GNUNET_ShortHashCode));
-
-    if ((members) && (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (members, id)))
-      counter--;
-    else
-      break;
-  }
-  while (counter > 0);
-
-  if (counter)
-    return GNUNET_YES;
-
-  return GNUNET_NO;
-}
-
-const struct GNUNET_IDENTITY_PublicKey*
-get_anonymous_public_key ()
-{
-  static struct GNUNET_IDENTITY_PublicKey public_key;
-  static struct GNUNET_IDENTITY_Ego* ego = NULL;
-
-  if (!ego)
-  {
-    ego = GNUNET_IDENTITY_ego_get_anonymous();
-    GNUNET_IDENTITY_ego_get_public_key(ego, &public_key);
-  }
-
-  return &public_key;
-}
-
-void
-convert_messenger_key_to_port(const struct GNUNET_HashCode *key, struct GNUNET_HashCode *port)
-{
-  static uint32_t version_value = 0;
-  static struct GNUNET_HashCode version;
-
-  if (!version_value) {
-    version_value = (uint32_t) (GNUNET_MESSENGER_VERSION);
-    version_value = ((version_value >> 16) & 0xFFFF);
-    version_value = GNUNET_htole32(version_value);
-    GNUNET_CRYPTO_hash(&version_value, sizeof(version_value), &version);
-  }
-
-  GNUNET_CRYPTO_hash_sum(key, &version, port);
-}
diff --git a/src/messenger/messenger_api_util.h b/src/messenger/messenger_api_util.h
deleted file mode 100644
index af562a1e8..000000000
--- a/src/messenger/messenger_api_util.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @author Tobias Frisch
- * @file src/messenger/messenger_api_util.h
- * @brief messenger api: client implementation of GNUnet MESSENGER service
- */
-
-#ifndef GNUNET_SERVICE_MESSENGER_UTIL_H
-#define GNUNET_SERVICE_MESSENGER_UTIL_H
-
-#include "platform.h"
-#include "gnunet_cadet_service.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_identity_service.h"
-#include "gnunet_messenger_service.h"
-
-/**
- * Starts an urgent task to close a CADET channel asynchronously.
- *
- * @param[in/out] channel Channel
- */
-void
-delayed_disconnect_channel (struct GNUNET_CADET_Channel *channel);
-
-/**
- * Tries to generate an unused member id and store it into the <i>id</i> parameter.
- * A map containing all currently used member ids is used to check against.
- *
- * @param[out] id New member id
- * @param[in] members Map of member ids
- * @return #GNUNET_YES on success, #GNUNET_NO on failure
- */
-int
-generate_free_member_id (struct GNUNET_ShortHashCode *id, const struct GNUNET_CONTAINER_MultiShortmap *members);
-
-/**
- * Returns the public identity key of #GNUNET_IDENTITY_ego_get_anonymous() without
- * recalculating it every time.
- *
- * @return anonymous public key
- */
-const struct GNUNET_IDENTITY_PublicKey*
-get_anonymous_public_key ();
-
-/**
- * Converts a Messenger service key of a room to the specific port which
- * gets used for the CADET channels.
- *
- * The port includes upper bits of the #GNUNET_MESSENGER_VERSION to
- * reduce the chance of incompatible connections.
- *
- * @param[in] key Messenger service room key
- * @param[out] port CADET service port
- */
-void
-convert_messenger_key_to_port(const struct GNUNET_HashCode *key, struct GNUNET_HashCode *port);
-
-#endif //GNUNET_SERVICE_MESSENGER_UTIL_H
diff --git a/src/messenger/test_messenger.c b/src/messenger/test_messenger.c
deleted file mode 100644
index fb3e3e1bc..000000000
--- a/src/messenger/test_messenger.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-#include <stdio.h>
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_messenger_service.h"
-
-/**
- * How long until we really give up on a particular testcase portion?
- */
-#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, \
-                                                     60)
-
-/**
- * How long until we give up on any particular operation (and retry)?
- */
-#define BASE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-#define TESTER_NAME "tester"
-
-static int status = 1;
-
-static struct GNUNET_SCHEDULER_Task *die_task = NULL;
-static struct GNUNET_SCHEDULER_Task *op_task = NULL;
-
-struct GNUNET_MESSENGER_Handle *messenger = NULL;
-
-static void
-end (void *cls)
-{
-  die_task = NULL;
-
-  if (op_task)
-  {
-    GNUNET_SCHEDULER_cancel (op_task);
-    op_task = NULL;
-  }
-
-  if (messenger)
-  {
-    GNUNET_MESSENGER_disconnect (messenger);
-    messenger = NULL;
-  }
-
-  status = 0;
-}
-
-static void
-end_badly (void *cls)
-{
-  fprintf (stderr, "Testcase failed (timeout).\n");
-
-  end (NULL);
-  status = 1;
-}
-
-static void
-end_operation (void *cls)
-{
-  op_task = NULL;
-
-  fprintf (stderr, "Testcase failed (operation: '%s').\n", cls ? (const char*) cls : "unknown");
-
-  if (die_task)
-    GNUNET_SCHEDULER_cancel (die_task);
-
-  end (NULL);
-  status = 1;
-}
-
-static int identity_counter = 0;
-
-/**
- * Function called when an identity is retrieved.
- *
- * @param cls Closure
- * @param handle Handle of messenger service
- */
-static void
-on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
-{
-  if (op_task)
-  {
-    GNUNET_SCHEDULER_cancel (op_task);
-    op_task = NULL;
-  }
-
-  const char *name = GNUNET_MESSENGER_get_name (handle);
-
-  if (0 != strcmp (name, TESTER_NAME))
-  {
-    op_task = GNUNET_SCHEDULER_add_now (&end_operation, "name");
-    return;
-  }
-
-  const struct GNUNET_IDENTITY_PublicKey *key = GNUNET_MESSENGER_get_key (handle);
-
-  if (((!identity_counter) && (key)) || ((identity_counter) && (!key)))
-  {
-    op_task = GNUNET_SCHEDULER_add_now (&end_operation, "key");
-    return;
-  }
-
-  if (identity_counter)
-  {
-    GNUNET_MESSENGER_disconnect (handle);
-
-    op_task = NULL;
-    messenger = NULL;
-
-    if (die_task)
-      GNUNET_SCHEDULER_cancel (die_task);
-
-    die_task = GNUNET_SCHEDULER_add_now (&end, NULL);
-    return;
-  }
-
-  GNUNET_MESSENGER_update (messenger);
-  identity_counter++;
-}
-
-/**
- * Main function for testcase.
- *
- * @param cls Closure
- * @param cfg Configuration
- * @param peer Peer for testing
- */
-static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer)
-{
-  die_task = GNUNET_SCHEDULER_add_delayed (TOTAL_TIMEOUT, &end_badly, NULL);
-
-  identity_counter = 0;
-
-  op_task = GNUNET_SCHEDULER_add_delayed (BASE_TIMEOUT, &end_operation, "connect");
-  messenger = GNUNET_MESSENGER_connect (cfg, TESTER_NAME, &on_identity, NULL, NULL, NULL);
-}
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  if (0 != GNUNET_TESTING_peer_run ("test-messenger", "test_messenger_api.conf", &run, NULL))
-    return 1;
-
-  return status;
-}
diff --git a/src/messenger/test_messenger_adapt.c b/src/messenger/test_messenger_adapt.c
deleted file mode 100644
index 90e8ac28d..000000000
--- a/src/messenger/test_messenger_adapt.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_adapt.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    5,    1,    2,    3,    6,    7,    8,    4 };
-  unsigned int stages [] = { 0x21, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_adapt", &cfg);
-}
diff --git a/src/messenger/test_messenger_anonymous.c b/src/messenger/test_messenger_anonymous.c
deleted file mode 100644
index a70121a30..000000000
--- a/src/messenger/test_messenger_anonymous.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_anonymous.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-#include <stdio.h>
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_messenger_service.h"
-
-/**
- * How long until we really give up on a particular testcase portion?
- */
-#define TOTAL_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, \
-                                                     60)
-
-/**
- * How long until we give up on any particular operation (and retry)?
- */
-#define BASE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
-static int status = 1;
-
-static struct GNUNET_SCHEDULER_Task *die_task = NULL;
-static struct GNUNET_SCHEDULER_Task *op_task = NULL;
-
-struct GNUNET_MESSENGER_Handle *messenger = NULL;
-
-static void
-end (void *cls)
-{
-  die_task = NULL;
-
-  if (op_task)
-  {
-    GNUNET_SCHEDULER_cancel (op_task);
-    op_task = NULL;
-  }
-
-  if (messenger)
-  {
-    GNUNET_MESSENGER_disconnect (messenger);
-    messenger = NULL;
-  }
-
-  status = 0;
-}
-
-static void
-end_badly (void *cls)
-{
-  fprintf (stderr, "Testcase failed (timeout).\n");
-
-  end (NULL);
-  status = 1;
-}
-
-static void
-end_operation (void *cls)
-{
-  op_task = NULL;
-
-  fprintf (stderr, "Testcase failed (operation: '%s').\n", cls ? (const char*) cls : "unknown");
-
-  if (die_task)
-    GNUNET_SCHEDULER_cancel (die_task);
-
-  end (NULL);
-  status = 1;
-}
-
-/**
- * Function called when an identity is retrieved.
- *
- * @param cls Closure
- * @param handle Handle of messenger service
- */
-static void
-on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle)
-{
-  if (op_task)
-  {
-    GNUNET_SCHEDULER_cancel (op_task);
-    op_task = NULL;
-  }
-
-  const char *name = GNUNET_MESSENGER_get_name (handle);
-
-  if (NULL != name)
-  {
-    op_task = GNUNET_SCHEDULER_add_now (&end_operation, "name-anonymous");
-    return;
-  }
-
-  if (GNUNET_SYSERR != GNUNET_MESSENGER_update (handle))
-  {
-    op_task = GNUNET_SCHEDULER_add_now (&end_operation, "update-fail");
-    return;
-  }
-
-  const struct GNUNET_IDENTITY_PublicKey *key = GNUNET_MESSENGER_get_key (handle);
-
-  if (key)
-  {
-    op_task = GNUNET_SCHEDULER_add_now (&end_operation, "key-anonymous");
-    return;
-  }
-
-  GNUNET_MESSENGER_disconnect (handle);
-
-  messenger = NULL;
-
-  if (die_task)
-    GNUNET_SCHEDULER_cancel (die_task);
-
-  die_task = GNUNET_SCHEDULER_add_now (&end, NULL);
-}
-
-/**
- * Main function for testcase.
- *
- * @param cls Closure
- * @param cfg Configuration
- * @param peer Peer for testing
- */
-static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer)
-{
-  die_task = GNUNET_SCHEDULER_add_delayed (TOTAL_TIMEOUT, &end_badly, NULL);
-
-  op_task = GNUNET_SCHEDULER_add_delayed (BASE_TIMEOUT, &end_operation, "connect");
-  messenger = GNUNET_MESSENGER_connect (cfg, NULL, &on_identity, NULL, NULL, NULL);
-}
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  if (0 != GNUNET_TESTING_peer_run ("test-messenger", "test_messenger_api.conf", &run, NULL))
-    return 1;
-
-  return status;
-}
diff --git a/src/messenger/test_messenger_api.conf b/src/messenger/test_messenger_api.conf
deleted file mode 100644
index 968f56f6d..000000000
--- a/src/messenger/test_messenger_api.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
-
-[testbed]
-HOSTNAME = localhost
-OVERLAY_TOPOLOGY = CLIQUE
-
-[arm]
-GLOBAL_POSTFIX = -l $GNUNET_CACHE_HOME/{}-logs -L verbose
-
-[transport]
-IMMEDIATE_START = YES
-
-[core]
-START_ON_DEMAND = YES
-IMMEDIATE_START = YES
-USE_EPHEMERAL_KEYS = NO
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-messenger-api/
-
-[peerinfo]
-NO_IO = YES
-
-[cadet]
-START_ON_DEMAND = YES
-REFRESH_CONNECTION_TIME = 1 s
-ID_ANNOUNCE_TIME = 5 s
-CONNECT_TIMEOUT = 30 s
-DEFAULT_TTL = 16
-DHT_REPLICATION_LEVEL = 10
-MAX_TUNNELS = 10
-MAX_CONNECTIONS = 10
-MAX_MSGS_QUEUE = 20
-DISABLE_TRY_CONNECT = YES
-REKEY_PERIOD = 2 s
-
-[identity]
-START_ON_DEMAND = YES
-
-[messenger]
-START_ON_DEMAND = YES
-
-[nat]
-ENABLE_UPNP = NO
-RETURN_LOCAL_ADDRESSES = YES
-IMMEDIATE_START = NO
\ No newline at end of file
diff --git a/src/messenger/test_messenger_async_client.c b/src/messenger/test_messenger_async_client.c
deleted file mode 100644
index 1067b9a6d..000000000
--- a/src/messenger/test_messenger_async_client.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_async_client.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    0,    1 };
-  unsigned int stages [] = { 0x10, 0x20 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_async_client", &cfg);
-}
diff --git a/src/messenger/test_messenger_async_p2p.c b/src/messenger/test_messenger_async_p2p.c
deleted file mode 100644
index d827aae16..000000000
--- a/src/messenger/test_messenger_async_p2p.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_async_p2p.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    2,    1 };
-  unsigned int stages [] = { 0x30, 0x30 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_async_p2p", &cfg);
-}
diff --git a/src/messenger/test_messenger_growth.c b/src/messenger/test_messenger_growth.c
deleted file mode 100644
index 3781f3ee5..000000000
--- a/src/messenger/test_messenger_growth.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_growth.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    0,    1,    1,    1,    1,    1,    1,    1 };
-  unsigned int stages [] = { 0x01, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_growth", &cfg);
-}
diff --git a/src/messenger/test_messenger_ring.c b/src/messenger/test_messenger_ring.c
deleted file mode 100644
index 07cfd0c47..000000000
--- a/src/messenger/test_messenger_ring.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_ring.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    8,    1,    2,    3,    4,    5,    6,    7 };
-  unsigned int stages [] = { 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_ring", &cfg);
-}
diff --git a/src/messenger/test_messenger_server.c b/src/messenger/test_messenger_server.c
deleted file mode 100644
index 1cf2fcc27..000000000
--- a/src/messenger/test_messenger_server.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_server.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    0,    1,    1,    1,    1,    1,    1,    1 };
-  unsigned int stages [] = { 0x01, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 };
-
-  struct test_configuration cfg;
-  cfg.count = 8;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_server", &cfg);
-}
diff --git a/src/messenger/test_messenger_sync_client.c b/src/messenger/test_messenger_sync_client.c
deleted file mode 100644
index 99f26b018..000000000
--- a/src/messenger/test_messenger_sync_client.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_sync_client.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    0,    1 };
-  unsigned int stages [] = { 0x01, 0x20 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_sync_client", &cfg);
-}
diff --git a/src/messenger/test_messenger_sync_p2p.c b/src/messenger/test_messenger_sync_p2p.c
deleted file mode 100644
index 77ce280a1..000000000
--- a/src/messenger/test_messenger_sync_p2p.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_sync_p2p.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    2,    1 };
-  unsigned int stages [] = { 0x21, 0x21 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_sync_p2p", &cfg);
-}
diff --git a/src/messenger/test_messenger_worst_client.c b/src/messenger/test_messenger_worst_client.c
deleted file mode 100644
index 63826631c..000000000
--- a/src/messenger/test_messenger_worst_client.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_worst_client.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    0,    1 };
-  unsigned int stages [] = { 0x10, 0x02 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_worst_client", &cfg);
-}
diff --git a/src/messenger/test_messenger_worst_p2p.c b/src/messenger/test_messenger_worst_p2p.c
deleted file mode 100644
index c89288eea..000000000
--- a/src/messenger/test_messenger_worst_p2p.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/test_messenger_worst_p2p.c
- * @author Tobias Frisch
- * @brief Test for the messenger service using cadet API.
- */
-
-#include "testing_messenger_setup.h"
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char **argv)
-{
-  unsigned int doors  [] = {    2,    1 };
-  unsigned int stages [] = { 0x12, 0x12 };
-
-  struct test_configuration cfg;
-  cfg.count = 2;
-  cfg.doors = doors;
-  cfg.stages = stages;
-
-  return GNUNET_run_messenger_setup ("test_messenger_worst_p2p", &cfg);
-}
diff --git a/src/messenger/testing_messenger_barrier.c b/src/messenger/testing_messenger_barrier.c
deleted file mode 100644
index 618d255b7..000000000
--- a/src/messenger/testing_messenger_barrier.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/testing_messenger_barrier.c
- * @author Tobias Frisch
- * @brief Pseudo-barriers for simple event handling
- */
-
-#include "testing_messenger_barrier.h"
-
-struct GNUNET_BarrierHandle
-{
-  unsigned int requirement;
-  GNUNET_BarrierStatusCallback cb;
-  void *cls;
-
-  struct GNUNET_BarrierWaitHandle *head;
-  struct GNUNET_BarrierWaitHandle *tail;
-
-  struct GNUNET_SCHEDULER_Task* task;
-};
-
-struct GNUNET_BarrierHandle*
-GNUNET_init_barrier (unsigned int requirement,
-                     GNUNET_BarrierStatusCallback cb,
-                     void *cb_cls)
-{
-  if (0 == requirement)
-    return NULL;
-
-  struct GNUNET_BarrierHandle *barrier = GNUNET_new(struct GNUNET_BarrierHandle);
-
-  if (!barrier)
-    return NULL;
-
-  barrier->requirement = requirement;
-  barrier->cb = cb;
-  barrier->cls = cb_cls;
-  barrier->head = NULL;
-  barrier->tail = NULL;
-  barrier->task = NULL;
-
-  return barrier;
-}
-
-static void
-exit_status (struct GNUNET_BarrierHandle *barrier, int status);
-
-static void
-cancel_barrier (void *cls)
-{
-  exit_status ((struct GNUNET_BarrierHandle*) cls, GNUNET_SYSERR);
-}
-
-static void
-complete_barrier (void *cls)
-{
-  exit_status ((struct GNUNET_BarrierHandle*) cls, GNUNET_OK);
-}
-
-void
-GNUNET_cancel_barrier (struct GNUNET_BarrierHandle *barrier)
-{
-  if ((!barrier) || (barrier->task))
-    return;
-
-  barrier->task = GNUNET_SCHEDULER_add_now(cancel_barrier, barrier);
-}
-
-struct GNUNET_BarrierWaitHandle
-{
-  GNUNET_BarrierWaitStatusCallback cb;
-  void *cls;
-
-  struct GNUNET_BarrierWaitHandle *prev;
-  struct GNUNET_BarrierWaitHandle *next;
-
-  struct GNUNET_BarrierHandle *barrier;
-};
-
-static void
-exit_status (struct GNUNET_BarrierHandle *barrier, int status)
-{
-  struct GNUNET_BarrierWaitHandle *waiting = barrier->head;
-  while (waiting)
-  {
-    struct GNUNET_BarrierWaitHandle *current = waiting;
-
-    if (current->cb)
-      current->cb(current->cls, current, status);
-
-    waiting = waiting->next;
-
-    GNUNET_CONTAINER_DLL_remove(barrier->head, barrier->tail, current);
-    GNUNET_free(current);
-  }
-
-  if (barrier->cb)
-    barrier->cb(barrier->cls, barrier, status);
-
-  GNUNET_free(barrier);
-}
-
-struct GNUNET_BarrierWaitHandle*
-GNUNET_wait_barrier (struct GNUNET_BarrierHandle *barrier,
-                     GNUNET_BarrierWaitStatusCallback cb,
-                     void *cb_cls)
-{
-  if ((!barrier) || (0 == barrier->requirement))
-    return NULL;
-
-  struct GNUNET_BarrierWaitHandle *waiting = GNUNET_new(struct GNUNET_BarrierWaitHandle);
-
-  if (!waiting)
-    return NULL;
-
-  waiting->cb = cb;
-  waiting->cls = cb_cls;
-  waiting->prev = NULL;
-  waiting->next = NULL;
-  waiting->barrier = barrier;
-
-  GNUNET_CONTAINER_DLL_insert_tail(barrier->head, barrier->tail, waiting);
-  barrier->requirement--;
-
-  if ((barrier->requirement == 0) && (!barrier->task))
-    barrier->task = GNUNET_SCHEDULER_add_now(complete_barrier, barrier);
-
-  return waiting;
-}
-
-void
-GNUNET_cancel_wait_barrier (struct GNUNET_BarrierWaitHandle *waiting)
-{
-  if (!waiting)
-    return;
-
-  struct GNUNET_BarrierHandle *barrier = waiting->barrier;
-
-  if (!barrier)
-    return;
-
-  if ((barrier->requirement == 0) && (barrier->task))
-  {
-    GNUNET_SCHEDULER_cancel(barrier->task);
-    barrier->task = NULL;
-  }
-
-  barrier->requirement++;
-  GNUNET_CONTAINER_DLL_remove(barrier->head, barrier->tail, waiting);
-
-  GNUNET_free(waiting);
-}
diff --git a/src/messenger/testing_messenger_barrier.h b/src/messenger/testing_messenger_barrier.h
deleted file mode 100644
index 3062a393a..000000000
--- a/src/messenger/testing_messenger_barrier.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/testing_messenger_barrier.h
- * @author Tobias Frisch
- * @brief Pseudo-barriers for simple event handling
- */
-
-#ifndef GNUNET_TESTING_MESSENGER_BARRIER_H_
-#define GNUNET_TESTING_MESSENGER_BARRIER_H_
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-
-/**
- * Handle for pseudo-barrier
- */
-struct GNUNET_BarrierHandle;
-
-
-/**
- * Functions of this type are to be given as callback argument to
- * GNUNET_init_barrier(). The callback will be called when status
- * information is available for the pseudo-barrier.
- *
- * @param cls the closure given to GNUNET_init_barrier()
- * @param barrier the pseudo-barrier handle
- * @param status status of the pseudo-barrier. The pseudo-barrier is removed
- *          once it has been crossed or an error occurs while processing it.
- *          Therefore it is invalid to call GNUNET_cancel_barrier() on a
- *          crossed or errored pseudo-barrier.
- */
-typedef void
-(*GNUNET_BarrierStatusCallback) (void *cls,
-                                 struct GNUNET_BarrierHandle *barrier,
-                                 int status);
-
-
-/**
- * Initialise a pseudo-barrier and call the given callback when the required
- * amount of peers (requirement) reach the pseudo-barrier OR upon error.
- *
- * @param requirement the amount of peers that is required to reach the
- *   pseudo-barrier. Peers signal reaching a pseudo-barrier by calling
- *   GNUNET_wait_barrier().
- * @param cb the callback to call when the pseudo-barrier is reached or upon
- *   error. Can be NULL.
- * @param cls closure for the above callback
- * @return pseudo-barrier handle; NULL upon error
- */
-struct GNUNET_BarrierHandle*
-GNUNET_init_barrier (unsigned int requirement,
-                     GNUNET_BarrierStatusCallback cb,
-                     void *cb_cls);
-
-
-/**
- * Cancel a pseudo-barrier.
- *
- * @param barrier the pseudo-barrier handle
- */
-void
-GNUNET_cancel_barrier (struct GNUNET_BarrierHandle *barrier);
-
-
-/**
- * Handle for pseudo-barrier wait
- */
-struct GNUNET_BarrierWaitHandle;
-
-
-/**
- * Functions of this type are to be given as acallback argument to
- * GNUNET_wait_barrier(). The callback will be called when the pseudo-barrier
- * corresponding given in GNUNET_wait_barrier() is crossed or cancelled.
- *
- * @param cls closure pointer given to GNUNET_wait_barrier()
- * @param waiting the pseudo-barrier wait handle
- * @param status #GNUNET_SYSERR in case of error while waiting for the
- *   pseudo-barrier; #GNUNET_OK if the pseudo-barrier is crossed
- */
-typedef void
-(*GNUNET_BarrierWaitStatusCallback) (void *cls,
-                                     struct GNUNET_BarrierWaitHandle *waiting,
-                                     int status);
-
-
-/**
- * Wait for a pseudo-barrier to be crossed. This function should be called for
- * the peers which have been started by the testbed.
- *
- * @param barrier the pseudo-barrier handle
- * @param cb the pseudo-barrier wait callback
- * @param cls the closure for the above callback
- * @return pseudo-barrier wait handle which can be used to cancel the waiting
- *   at anytime before the callback is called. NULL upon error.
- */
-struct GNUNET_BarrierWaitHandle*
-GNUNET_wait_barrier (struct GNUNET_BarrierHandle *barrier,
-                     GNUNET_BarrierWaitStatusCallback cb,
-                     void *cb_cls);
-
-
-/**
- * Cancel a pseudo-barrier wait handle. Should not be called in or after the
- * callback given to GNUNET_wait_barrier() has been called.
- *
- * @param waiting the pseudo-barrier wait handle
- */
-void
-GNUNET_cancel_wait_barrier (struct GNUNET_BarrierWaitHandle *waiting);
-
-
-#endif /* GNUNET_TESTING_MESSENGER_BARRIER_H_ */
diff --git a/src/messenger/testing_messenger_setup.c b/src/messenger/testing_messenger_setup.c
deleted file mode 100644
index 98241fa08..000000000
--- a/src/messenger/testing_messenger_setup.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2020--2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/testing_messenger_barrier.c
- * @author Tobias Frisch
- * @brief A simple test-case setup for the messenger service
- */
-
-#include "testing_messenger_setup.h"
-
-#include <stdio.h>
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_logger_service.h"
-#include "gnunet_testbed_service.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_messenger_service.h"
-#include "testing_messenger_barrier.h"
-
-#define TEST_ROOM "test"
-#define TEST_NAME "tester"
-
-struct test_properties;
-
-struct test_peer {
-  struct test_properties *props;
-  unsigned int num;
-
-  struct GNUNET_SCHEDULER_Task *op_task;
-  struct GNUNET_TESTBED_Operation *op;
-
-  struct GNUNET_TESTBED_Peer *peer;
-  struct GNUNET_PeerIdentity peer_id;
-  struct GNUNET_BarrierWaitHandle *wait;
-
-  struct GNUNET_MESSENGER_Handle *handle;
-  struct GNUNET_MESSENGER_Room *room;
-
-  unsigned int peer_messages;
-
-  const char *message;
-};
-
-struct test_properties {
-  const struct test_configuration *cfg;
-
-  unsigned int num_hosts;
-
-  struct GNUNET_SCHEDULER_Task *die_task;
-  struct GNUNET_SCHEDULER_Task *end_task;
-
-  struct GNUNET_BarrierHandle *barrier;
-
-  struct test_peer *peers;
-  unsigned int num_peer;
-
-  int status;
-};
-
-static void
-shutdown_cb (void *cls)
-{
-  struct test_properties *properties = cls;
-
-
-  for (unsigned int i = 0; i < properties->num_peer; i++)
-  {
-    struct test_peer *peer = &properties->peers[i];
-
-    GNUNET_assert(peer != NULL);
-
-    if (peer->op_task)
-      GNUNET_SCHEDULER_cancel(peer->op_task);
-
-    peer->op_task = NULL;
-
-    if (peer->op)
-      GNUNET_TESTBED_operation_done (peer->op);
-
-    peer->op = NULL;
-
-    if (peer->wait)
-      GNUNET_cancel_wait_barrier(peer->wait);
-
-    peer->wait = NULL;
-
-    if (peer->room)
-      GNUNET_MESSENGER_close_room (peer->room);
-
-    peer->room = NULL;
-
-    if (peer->handle)
-      GNUNET_MESSENGER_disconnect (peer->handle);
-
-    peer->handle = NULL;
-  }
-
-  if (properties->die_task)
-    GNUNET_SCHEDULER_cancel(properties->die_task);
-
-  properties->die_task = NULL;
-  properties->end_task = NULL;
-
-  if (properties->barrier)
-    GNUNET_cancel_barrier(properties->barrier);
-
-  properties->barrier = NULL;
-}
-
-
-
-static void
-end_cb (void *cls)
-{
-  struct test_properties *properties = cls;
-
-  GNUNET_assert(properties != NULL);
-
-  properties->die_task = NULL;
-
-  int status = 0;
-
-  for (unsigned int i = 0; i < properties->num_peer; i++)
-  {
-    struct test_peer *peer = &properties->peers[i];
-
-    GNUNET_assert(peer != NULL);
-
-    const int members = GNUNET_MESSENGER_iterate_members(peer->room, NULL, NULL);
-
-    GNUNET_assert (members >= 0);
-
-    if (peer->props->num_peer != (unsigned int) members)
-    {
-      fprintf (stderr, "Testcase failed (members: %d/%u).\n", members, peer->props->num_peer);
-      status = 1;
-      break;
-    }
-  }
-
-  GNUNET_SCHEDULER_shutdown ();
-
-  properties->status = status;
-}
-
-static void
-end_badly_cb (void *cls)
-{
-  struct test_properties *properties = cls;
-
-  GNUNET_assert(properties != NULL);
-
-  fprintf (stderr, "Testcase failed (timeout).\n");
-
-  end_cb (properties);
-
-  properties->status = 1;
-}
-
-static void
-end_operation_cb (void *cls)
-{
-  struct test_peer *peer = cls;
-
-  GNUNET_assert(peer != NULL);
-
-  peer->op_task = NULL;
-
-  fprintf (stderr, "Testcase failed (operation: '%s').\n", peer->message);
-
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-static void
-end_error_cb (void *cls)
-{
-  struct test_peer *peer = cls;
-
-  GNUNET_assert(peer != NULL);
-
-  peer->op_task = NULL;
-
-  fprintf (stderr, "Testcase failed (error: '%s').\n", peer->message);
-  GNUNET_free (peer);
-
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-static void
-barrier2_wait_cb (void *cls, struct GNUNET_BarrierWaitHandle *waiting, int status)
-{
-  struct test_peer *peer = cls;
-
-  GNUNET_assert(peer != NULL);
-
-  if (peer->wait == waiting)
-    peer->wait = NULL;
-}
-
-static void
-barrier_wait_cb (void *cls, struct GNUNET_BarrierWaitHandle *waiting, int status)
-{
-  struct test_peer *peer = cls;
-
-  GNUNET_assert(peer != NULL);
-
-  if (peer->wait == waiting)
-    peer->wait = NULL;
-
-  if (0 != (peer->props->cfg->stages[peer->num - 1] & 0x02))
-  {
-    unsigned int door = peer->props->cfg->doors[peer->num - 1];
-
-    if (door == 0)
-      door = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, peer->props->cfg->count);
-    else
-      door = door - 1;
-
-    struct GNUNET_HashCode hash;
-    GNUNET_CRYPTO_hash (TEST_ROOM, sizeof(TEST_ROOM), &hash);
-
-    struct GNUNET_MESSENGER_Room *room;
-    room = GNUNET_MESSENGER_enter_room(peer->handle, &(peer->props->peers[door].peer_id), &hash);
-
-    if (peer->room)
-      GNUNET_assert(room == peer->room);
-    else
-      GNUNET_assert(room != NULL);
-
-    peer->room = room;
-  }
-}
-
-/**
- * Function called whenever a message is received or sent.
- *
- * @param cls Closure
- * @param room Room
- * @param sender Sender
- * @param message Message
- * @param hash Hash of message
- * @param flags Flags of message
- */
-static void
-on_message (void *cls, struct GNUNET_MESSENGER_Room *room, const struct GNUNET_MESSENGER_Contact *sender,
-            const struct GNUNET_MESSENGER_Message *message, const struct GNUNET_HashCode *hash,
-            enum GNUNET_MESSENGER_MessageFlags flags)
-{
-  struct test_peer *peer = cls;
-
-  GNUNET_assert(peer != NULL);
-
-  fprintf (stderr, "Peer: %s; [%s] Message: %s (%s)\n",
-           GNUNET_i2s(&(peer->peer_id)),
-           GNUNET_sh2s(&(message->header.sender_id)),
-           GNUNET_MESSENGER_name_of_kind(message->header.kind),
-           GNUNET_h2s(hash));
-
-  if (GNUNET_MESSENGER_KIND_PEER == message->header.kind)
-    peer->peer_messages++;
-
-  if (peer->props->num_hosts == peer->peer_messages)
-    peer->wait = GNUNET_wait_barrier (peer->props->barrier, &barrier2_wait_cb, peer);
-  else if (peer->props->num_hosts < peer->peer_messages)
-  {
-    if (peer->wait)
-      GNUNET_cancel_wait_barrier(peer->wait);
-
-    peer->wait = NULL;
-
-    if (peer->op_task)
-      GNUNET_SCHEDULER_cancel(peer->op_task);
-
-    peer->message = "peer";
-    peer->op_task = GNUNET_SCHEDULER_add_now (&end_operation_cb, peer);
-  }
-}
-
-static void
-second_stage (void *cls)
-{
-  struct test_peer *peer = cls;
-
-  GNUNET_assert(peer != NULL);
-
-  peer->op_task = NULL;
-
-  struct GNUNET_HashCode hash;
-  GNUNET_CRYPTO_hash (TEST_ROOM, sizeof(TEST_ROOM), &hash);
-
-  if (0 != (peer->props->cfg->stages[peer->num - 1] & 0x10))
-  {
-    struct GNUNET_MESSENGER_Room *room;
-    room = GNUNET_MESSENGER_open_room (peer->handle, &hash);
-
-    if (peer->room)
-      GNUNET_assert(room == peer->room);
-    else
-      GNUNET_assert(room != NULL);
-
-    peer->room = room;
-  }
-
-  if (0 != (peer->props->cfg->stages[peer->num - 1] & 0x20))
-  {
-    unsigned int door = peer->props->cfg->doors[peer->num - 1];
-
-    if (door == 0)
-      door = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, peer->props->cfg->count);
-    else
-      door = door - 1;
-
-    struct GNUNET_MESSENGER_Room *room;
-    room = GNUNET_MESSENGER_enter_room(peer->handle, &(peer->props->peers[door].peer_id), &hash);
-
-    if (peer->room)
-      GNUNET_assert(room == peer->room);
-    else
-      GNUNET_assert(room != NULL);
-
-    peer->room = room;
-  }
-}
-
-static void
-on_peer (void *cb_cls, struct GNUNET_TESTBED_Operation *op, const struct GNUNET_TESTBED_PeerInformation *pinfo,
-         const char *emsg)
-{
-  struct test_peer *peer = cb_cls;
-
-  GNUNET_assert(peer != NULL);
-
-  if (emsg)
-  {
-    peer->message = GNUNET_strdup(emsg);
-    peer->op_task = GNUNET_SCHEDULER_add_now (&end_error_cb, peer);
-    return;
-  }
-
-  if (!pinfo)
-  {
-    peer->message = "info";
-    peer->op_task = GNUNET_SCHEDULER_add_now (&end_operation_cb, peer);
-    return;
-  }
-
-  if (pinfo->pit != GNUNET_TESTBED_PIT_CONFIGURATION)
-  {
-    peer->message = "config";
-    peer->op_task = GNUNET_SCHEDULER_add_now (&end_operation_cb, peer);
-    return;
-  }
-
-  peer->handle = GNUNET_MESSENGER_connect (pinfo->result.cfg, TEST_NAME, NULL, NULL, &on_message, peer);
-
-  GNUNET_assert(GNUNET_OK == GNUNET_CRYPTO_get_peer_identity(
-      pinfo->result.cfg, &(peer->peer_id)
-  ));
-
-  if (0 != (peer->props->cfg->stages[peer->num - 1] & 0x01))
-  {
-    struct GNUNET_HashCode hash;
-    GNUNET_CRYPTO_hash (TEST_ROOM, sizeof(TEST_ROOM), &hash);
-
-    peer->room = GNUNET_MESSENGER_open_room (peer->handle, &hash);
-
-    GNUNET_assert(peer->room != NULL);
-  }
-  else
-    peer->room = NULL;
-
-  peer->wait = GNUNET_wait_barrier (peer->props->barrier, &barrier_wait_cb, peer);
-}
-
-/**
- * Main function for a peer of the testcase.
- *
- * @param cls Closure
- * @param event Information about the event
- */
-static void
-run (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
-{
-  struct test_properties *properties = cls;
-
-  GNUNET_assert(properties != NULL);
-
-  if (GNUNET_TESTBED_ET_PEER_START != event->type)
-  {
-    fprintf (stderr, "Testcase failed (operation: 'start').\n");
-
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  struct test_peer *peer = &(properties->peers[properties->num_peer++]);
-
-  peer->props = properties;
-  peer->num = properties->num_peer;
-
-  peer->peer = event->details.peer_start.peer;
-  peer->op = GNUNET_TESTBED_peer_get_information (peer->peer, GNUNET_TESTBED_PIT_CONFIGURATION, on_peer, peer);
-}
-
-static void
-barrier2_cb (void *cls, struct GNUNET_BarrierHandle *barrier, int status)
-{
-  struct test_properties *properties = cls;
-
-  GNUNET_assert(properties != NULL);
-
-  if (properties->barrier == barrier)
-    properties->barrier = NULL;
-
-  if (GNUNET_SYSERR == status)
-  {
-    fprintf (stderr, "Testcase failed (operation: 'barrier2').\n");
-
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  else if (GNUNET_OK == status)
-  {
-    if (properties->die_task)
-      GNUNET_SCHEDULER_cancel(properties->die_task);
-
-    properties->die_task = GNUNET_SCHEDULER_add_delayed (
-        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, properties->cfg->count),
-        &end_cb, properties
-    );
-  }
-}
-
-static void
-barrier_cb (void *cls, struct GNUNET_BarrierHandle *barrier, int status)
-{
-  struct test_properties *properties = cls;
-
-  GNUNET_assert(properties != NULL);
-
-  if (properties->barrier == barrier)
-    properties->barrier = NULL;
-  else if (!properties->barrier)
-    return;
-
-  if (properties->num_peer != properties->cfg->count)
-  {
-    fprintf (stderr, "Testcase failed (operation: 'process').\n");
-
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-
-  if (GNUNET_SYSERR == status)
-  {
-    fprintf (stderr, "Testcase failed (operation: 'barrier').\n");
-
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  else if (GNUNET_OK == status)
-  {
-    properties->barrier = GNUNET_init_barrier (properties->num_peer, &barrier2_cb, properties);
-
-    for (unsigned int i = 0; i < properties->num_peer; i++)
-      properties->peers[i].op_task = GNUNET_SCHEDULER_add_now (&second_stage, &(properties->peers[i]));
-  }
-}
-
-static void
-init (void *cls, struct GNUNET_TESTBED_RunHandle *h, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
-      unsigned int links_succeeded, unsigned int links_failed)
-{
-  struct test_properties *properties = cls;
-
-  GNUNET_assert(properties != NULL);
-
-  properties->end_task = GNUNET_SCHEDULER_add_shutdown(&shutdown_cb, properties);
-  properties->die_task = GNUNET_SCHEDULER_add_delayed (
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, properties->cfg->count * 5),
-      &end_badly_cb, properties
-  );
-}
-
-int
-GNUNET_run_messenger_setup (const char* test_name, const struct test_configuration *cfg)
-{
-  struct test_properties properties;
-  memset(&properties, 0, sizeof(properties));
-
-  properties.cfg = cfg;
-  properties.peers = GNUNET_new_array(cfg->count, struct test_peer);
-
-  for (unsigned int i = 0; i < cfg->count; i++)
-    if (0 != (cfg->stages[i] & 0x11))
-      properties.num_hosts++;
-
-  properties.status = 1;
-  properties.barrier = GNUNET_init_barrier (cfg->count, &barrier_cb, &properties);
-
-  if (GNUNET_OK != GNUNET_TESTBED_test_run (test_name, "test_messenger_api.conf",
-                                            cfg->count,
-                                            (1LL << GNUNET_TESTBED_ET_PEER_START),
-                                            &run, &properties,
-                                            &init, &properties))
-    return 1;
-
-  GNUNET_free(properties.peers);
-
-  return properties.status;
-}
diff --git a/src/messenger/testing_messenger_setup.h b/src/messenger/testing_messenger_setup.h
deleted file mode 100644
index 5e6b5d461..000000000
--- a/src/messenger/testing_messenger_setup.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-   This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
-
-   GNUnet is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Affero General Public License as published
-   by the Free Software Foundation, either version 3 of the License,
-   or (at your option) any later version.
-
-   GNUnet is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-   SPDX-License-Identifier: AGPL3.0-or-later
- */
-/**
- * @file messenger/testing_messenger_setup.h
- * @author Tobias Frisch
- * @brief A simple test-case setup for the messenger service
- */
-
-#ifndef GNUNET_TESTING_MESSENGER_SETUP_H_
-#define GNUNET_TESTING_MESSENGER_SETUP_H_
-
-struct test_configuration
-{
-  unsigned int count;
-  unsigned int *doors;
-  unsigned int *stages;
-};
-
-int
-GNUNET_run_messenger_setup (const char* test_name, const struct test_configuration *cfg);
-
-#endif /* GNUNET_TESTING_MESSENGER_SETUP_H_ */