diff --git a/BUILD.bazel b/BUILD.bazel
index c8726bd92..7edd11fd7 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -30,7 +30,6 @@ proto_library(
     srcs = [
         "lib/src/main/proto/Av.proto",
         "lib/src/main/proto/Core.proto",
-        "lib/src/main/proto/ProtoLog.proto",
     ],
 )
 
diff --git a/lib/src/main/cpp/CMakeLists.txt b/lib/src/main/cpp/CMakeLists.txt
index 493a05b66..aaedf14a4 100644
--- a/lib/src/main/cpp/CMakeLists.txt
+++ b/lib/src/main/cpp/CMakeLists.txt
@@ -68,14 +68,12 @@ add_library(
   ${ANDROID_CPU_FEATURES}
   ToxAv/Av.proto
   ToxCore/Core.proto
-  util/ProtoLog.proto
   ToxAv/generated/enums.cpp
   ToxAv/generated/errors.cpp
   ToxAv/generated/impls.h
   ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h
   ToxAv/generated/natives.h
   ToxAv/av.cpp
-  ToxAv/debug.cpp
   ToxAv/lifecycle.cpp
   ToxAv/ToxAv.cpp
   ToxAv/ToxAv.h
@@ -88,7 +86,6 @@ add_library(
   ToxCore/clientinfo.cpp
   ToxCore/connection.cpp
   ToxCore/custom.cpp
-  ToxCore/debug.cpp
   ToxCore/filetransfer.cpp
   ToxCore/friendlist.cpp
   ToxCore/interaction.cpp
@@ -99,7 +96,6 @@ add_library(
   ToxCrypto/generated/errors.cpp
   ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h
   ToxCrypto/generated/natives.h
-  ToxCrypto/debug.cpp
   ToxCrypto/encryptsave.cpp
   ToxCrypto/hash.cpp
   ToxCrypto/ToxCrypto.cpp
@@ -122,8 +118,6 @@ add_library(
   util/jni/Enum.h
   util/jni/UTFChars.cpp
   util/jni/UTFChars.h
-  util/debug_log.cpp
-  util/debug_log.h
   util/exceptions.cpp
   util/exceptions.h
   util/instance_manager.h
diff --git a/lib/src/main/cpp/ToxAv/debug.cpp b/lib/src/main/cpp/ToxAv/debug.cpp
deleted file mode 100644
index 6e6bd7223..000000000
--- a/lib/src/main/cpp/ToxAv/debug.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "ToxAv.h"
-
-#include <algorithm>
-#include <vector>
-
-template<>
-void
-print_arg<ToxAV *> (protolog::Value &value, ToxAV *const &tox)
-{
-  static std::vector<ToxAV *> ids;
-  auto found = std::find (ids.begin (), ids.end (), tox);
-  if (found == ids.end ())
-    {
-      ids.push_back (tox);
-      found = ids.end () - 1;
-    }
-  value.set_v_string ("@" + std::to_string (found - ids.begin () + 1));
-}
-
-template<>
-void
-print_arg<int16_t const *> (protolog::Value &value, int16_t const *const &data)
-{
-  if (data == nullptr)
-    value.set_v_string ("<null>");
-  else
-    value.set_v_string ("<audio samples>");
-}
-
-template<>
-void
-print_arg<av::Events *> (protolog::Value &value, av::Events *const &events)
-{
-  if (events == nullptr)
-    value.set_v_string ("<null>");
-  else
-    value.set_v_string ("<av::Events[" + std::to_string (events->ByteSizeLong ()) + "]>");
-}
diff --git a/lib/src/main/cpp/ToxAv/generated/enums.cpp b/lib/src/main/cpp/ToxAv/generated/enums.cpp
index 29d80438a..2a7d630df 100644
--- a/lib/src/main/cpp/ToxAv/generated/enums.cpp
+++ b/lib/src/main/cpp/ToxAv/generated/enums.cpp
@@ -34,23 +34,6 @@ Enum::valueOf<TOXAV_CALL_CONTROL> (JNIEnv *env, jint ordinal)
   tox4j_fatal ("Invalid enumerator from Java");
 }
 
-template<>
-void
-print_arg<TOXAV_CALL_CONTROL> (protolog::Value &value, TOXAV_CALL_CONTROL const &arg)
-{
-  switch (arg)
-    {
-    case TOXAV_CALL_CONTROL_RESUME: value.set_v_string ("TOXAV_CALL_CONTROL_RESUME"); return;
-    case TOXAV_CALL_CONTROL_PAUSE: value.set_v_string ("TOXAV_CALL_CONTROL_PAUSE"); return;
-    case TOXAV_CALL_CONTROL_CANCEL: value.set_v_string ("TOXAV_CALL_CONTROL_CANCEL"); return;
-    case TOXAV_CALL_CONTROL_MUTE_AUDIO: value.set_v_string ("TOXAV_CALL_CONTROL_MUTE_AUDIO"); return;
-    case TOXAV_CALL_CONTROL_UNMUTE_AUDIO: value.set_v_string ("TOXAV_CALL_CONTROL_UNMUTE_AUDIO"); return;
-    case TOXAV_CALL_CONTROL_HIDE_VIDEO: value.set_v_string ("TOXAV_CALL_CONTROL_HIDE_VIDEO"); return;
-    case TOXAV_CALL_CONTROL_SHOW_VIDEO: value.set_v_string ("TOXAV_CALL_CONTROL_SHOW_VIDEO"); return;
-    }
-  value.set_v_string ("(TOXAV_CALL_CONTROL)" + std::to_string (arg));
-}
-
 template<>
 jint
 Enum::ordinal<TOXAV_FRIEND_CALL_STATE> (JNIEnv *env, TOXAV_FRIEND_CALL_STATE valueOf)
@@ -82,19 +65,3 @@ Enum::valueOf<TOXAV_FRIEND_CALL_STATE> (JNIEnv *env, jint ordinal)
     }
   tox4j_fatal ("Invalid enumerator from Java");
 }
-
-template<>
-void
-print_arg<TOXAV_FRIEND_CALL_STATE> (protolog::Value &value, TOXAV_FRIEND_CALL_STATE const &arg)
-{
-  switch (arg)
-    {
-    case TOXAV_FRIEND_CALL_STATE_ERROR: value.set_v_string ("TOXAV_FRIEND_CALL_STATE_ERROR"); return;
-    case TOXAV_FRIEND_CALL_STATE_FINISHED: value.set_v_string ("TOXAV_FRIEND_CALL_STATE_FINISHED"); return;
-    case TOXAV_FRIEND_CALL_STATE_SENDING_A: value.set_v_string ("TOXAV_FRIEND_CALL_STATE_SENDING_A"); return;
-    case TOXAV_FRIEND_CALL_STATE_SENDING_V: value.set_v_string ("TOXAV_FRIEND_CALL_STATE_SENDING_V"); return;
-    case TOXAV_FRIEND_CALL_STATE_ACCEPTING_A: value.set_v_string ("TOXAV_FRIEND_CALL_STATE_ACCEPTING_A"); return;
-    case TOXAV_FRIEND_CALL_STATE_ACCEPTING_V: value.set_v_string ("TOXAV_FRIEND_CALL_STATE_ACCEPTING_V"); return;
-    }
-  value.set_v_string ("(TOXAV_FRIEND_CALL_STATE)" + std::to_string (arg));
-}
diff --git a/lib/src/main/cpp/ToxAv/lifecycle.cpp b/lib/src/main/cpp/ToxAv/lifecycle.cpp
index daba90692..b2a7900b1 100644
--- a/lib/src/main/cpp/ToxAv/lifecycle.cpp
+++ b/lib/src/main/cpp/ToxAv/lifecycle.cpp
@@ -105,29 +105,6 @@ toxav_new_unique (Tox *tox, TOXAV_ERR_NEW *error)
 }
 
 
-static NORETURN void
-toxav_finalize ()
-{
-  fprintf (stderr, "This function is only here for register_funcs and should never be called.");
-  abort ();
-}
-
-
-REGISTER_FUNCS (
-#define JAVA_METHOD_REF(x)
-#define CXX_FUNCTION_REF(func)  REGISTER_FUNC (func),
-#include "generated/natives.h"
-#undef CXX_FUNCTION_REF
-#undef JAVA_METHOD_REF
-
-#define CALLBACK(NAME)          REGISTER_FUNC (tox4j_##NAME##_cb),
-#include "tox/generated/av.h"
-#undef CALLBACK
-
-  REGISTER_FUNC (toxav_new_unique)
-);
-
-
 /*
  * Class:     im_tox_tox4j_impl_ToxAvJni
  * Method:    toxavNew
diff --git a/lib/src/main/cpp/ToxCore/ToxCore.h b/lib/src/main/cpp/ToxCore/ToxCore.h
index 530f7f0ab..f6280b6d4 100644
--- a/lib/src/main/cpp/ToxCore/ToxCore.h
+++ b/lib/src/main/cpp/ToxCore/ToxCore.h
@@ -57,59 +57,23 @@ template<
 >
 struct get_vector
 {
-  static bool register_funcs_0 ();
-
   static std::vector<ConvertT>
   make (Tox const *tox)
   {
     std::vector<T> vec (get_size (tox));
     get_data (tox, vec.data ());
 
-    assert (register_funcs_0 ());
-
     return convert_vector<ConvertT, T>::value (std::move (vec));
   }
 };
 
-template<
-  typename T,
-  size_t get_size (Tox const *),
-  void get_data (Tox const *, T *),
-  typename ConvertT
->
-bool
-get_vector<T, get_size, get_data, ConvertT>::register_funcs_0 ()
-{
-  REGISTER_FUNCS (
-    reinterpret_cast<uintptr_t> (make),
-      "get_vector<" + get_func_name (get_size) + ", " + get_func_name (get_data) + ">"
-  );
-
-  return true;
-}
-
 
 template<std::size_t N>
 struct constant_size
 {
-  static bool register_funcs_0 ();
-
   static std::size_t
   make (Tox const *)
   {
-    assert (register_funcs_0 ());
     return N;
   }
 };
-
-template<std::size_t N>
-bool
-constant_size<N>::register_funcs_0 ()
-{
-  REGISTER_FUNCS (
-    reinterpret_cast<uintptr_t> (make),
-      "constant_size<" + std::to_string (N) + ">"
-  );
-
-  return true;
-}
diff --git a/lib/src/main/cpp/ToxCore/debug.cpp b/lib/src/main/cpp/ToxCore/debug.cpp
deleted file mode 100644
index 6fc4b0156..000000000
--- a/lib/src/main/cpp/ToxCore/debug.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-#include "ToxCore.h"
-
-#include <algorithm>
-#include <vector>
-
-template<>
-void
-print_arg<Tox *> (protolog::Value &value, Tox *const &tox)
-{
-  static std::vector<Tox *> ids;
-  auto found = std::find (ids.begin (), ids.end (), tox);
-  if (found == ids.end ())
-    {
-      ids.push_back (tox);
-      found = ids.end () - 1;
-    }
-  value.set_v_string ("@" + std::to_string (found - ids.begin () + 1));
-}
-
-template<>
-void
-print_arg<Tox_Options *> (protolog::Value &value, Tox_Options *const &options)
-{
-  if (options == nullptr)
-    value.set_v_string ("<null>");
-  else
-    {
-      protolog::Struct *object = value.mutable_v_object ();
-      print_member (*object, "ipv6_enabled", tox_options_get_ipv6_enabled(options));
-      print_member (*object, "udp_enabled", tox_options_get_udp_enabled(options));
-      print_member (*object, "proxy_type", tox_options_get_proxy_type(options));
-      print_member (*object, "proxy_host", tox_options_get_proxy_host(options));
-      print_member (*object, "start_port", tox_options_get_start_port(options));
-      print_member (*object, "end_port", tox_options_get_end_port(options));
-      print_member (*object, "tcp_port", tox_options_get_tcp_port(options));
-      print_member (*object, "savedata_type", tox_options_get_savedata_type(options));
-      print_member (*object, "savedata",
-        tox_options_get_savedata_data(options),
-        tox_options_get_savedata_length(options));
-    }
-}
-
-template<>
-void
-print_arg<core::Events *> (protolog::Value &value, core::Events *const &events)
-{
-  if (events == nullptr)
-    value.set_v_string ("<null>");
-  else
-    value.set_v_string ("<core::Events[" + std::to_string (events->ByteSizeLong ()) + "]>");
-}
-
-#define enum_case(ENUM)                               \
-    case TOX_##ENUM: value.set_v_string ("TOX_" #ENUM); break
-
-template<>
-void
-print_arg<TOX_FILE_KIND> (protolog::Value &value, TOX_FILE_KIND const &kind)
-{
-  switch (kind)
-    {
-    enum_case (FILE_KIND_DATA);
-    enum_case (FILE_KIND_AVATAR);
-    default:
-      value.set_v_string ("(TOX_FILE_KIND)" + std::to_string (kind));
-      break;
-    }
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jLastLog
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jLastLog
-  (JNIEnv *env, jclass)
-{
-  if (jni_log.empty ())
-    return nullptr;
-
-  return toJavaArray (env, jni_log.clear ());
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jSetMaxLogSize
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jSetMaxLogSize
-  (JNIEnv *, jclass, jint maxSize)
-{
-  jni_log.max_size (maxSize);
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jGetMaxLogSize
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jGetMaxLogSize
-  (JNIEnv *, jclass)
-{
-  return jni_log.max_size ();
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jGetCurrentLogSize
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jGetCurrentLogSize
-  (JNIEnv *, jclass)
-{
-  return jni_log.size ();
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jSetLogFilter
- * Signature: ([Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jSetLogFilter
-  (JNIEnv *env, jclass, jobjectArray filters)
-{
-  int stringCount = env->GetArrayLength (filters);
-
-  std::vector<std::string> filter_strings;
-  for (int i = 0; i < stringCount; i++)
-    {
-      UTFChars filter (env, static_cast<jstring> (env->GetObjectArrayElement(filters, i)));
-      filter_strings.push_back (filter.to_string ());
-    }
-
-  jni_log.filter (std::move (filter_strings));
-}
diff --git a/lib/src/main/cpp/ToxCore/generated/enums.cpp b/lib/src/main/cpp/ToxCore/generated/enums.cpp
index da2ffe476..9d3cc7b82 100644
--- a/lib/src/main/cpp/ToxCore/generated/enums.cpp
+++ b/lib/src/main/cpp/ToxCore/generated/enums.cpp
@@ -26,19 +26,6 @@ Enum::valueOf<TOX_CONNECTION> (JNIEnv *env, jint ordinal)
   tox4j_fatal ("Invalid enumerator from Java");
 }
 
-template<>
-void
-print_arg<TOX_CONNECTION> (protolog::Value &value, TOX_CONNECTION const &arg)
-{
-  switch (arg)
-    {
-    case TOX_CONNECTION_NONE: value.set_v_string ("TOX_CONNECTION_NONE"); return;
-    case TOX_CONNECTION_TCP: value.set_v_string ("TOX_CONNECTION_TCP"); return;
-    case TOX_CONNECTION_UDP: value.set_v_string ("TOX_CONNECTION_UDP"); return;
-    }
-  value.set_v_string ("(TOX_CONNECTION)" + std::to_string (arg));
-}
-
 template<>
 jint
 Enum::ordinal<TOX_FILE_CONTROL> (JNIEnv *env, TOX_FILE_CONTROL valueOf)
@@ -65,19 +52,6 @@ Enum::valueOf<TOX_FILE_CONTROL> (JNIEnv *env, jint ordinal)
   tox4j_fatal ("Invalid enumerator from Java");
 }
 
-template<>
-void
-print_arg<TOX_FILE_CONTROL> (protolog::Value &value, TOX_FILE_CONTROL const &arg)
-{
-  switch (arg)
-    {
-    case TOX_FILE_CONTROL_RESUME: value.set_v_string ("TOX_FILE_CONTROL_RESUME"); return;
-    case TOX_FILE_CONTROL_PAUSE: value.set_v_string ("TOX_FILE_CONTROL_PAUSE"); return;
-    case TOX_FILE_CONTROL_CANCEL: value.set_v_string ("TOX_FILE_CONTROL_CANCEL"); return;
-    }
-  value.set_v_string ("(TOX_FILE_CONTROL)" + std::to_string (arg));
-}
-
 template<>
 jint
 Enum::ordinal<TOX_MESSAGE_TYPE> (JNIEnv *env, TOX_MESSAGE_TYPE valueOf)
@@ -102,18 +76,6 @@ Enum::valueOf<TOX_MESSAGE_TYPE> (JNIEnv *env, jint ordinal)
   tox4j_fatal ("Invalid enumerator from Java");
 }
 
-template<>
-void
-print_arg<TOX_MESSAGE_TYPE> (protolog::Value &value, TOX_MESSAGE_TYPE const &arg)
-{
-  switch (arg)
-    {
-    case TOX_MESSAGE_TYPE_NORMAL: value.set_v_string ("TOX_MESSAGE_TYPE_NORMAL"); return;
-    case TOX_MESSAGE_TYPE_ACTION: value.set_v_string ("TOX_MESSAGE_TYPE_ACTION"); return;
-    }
-  value.set_v_string ("(TOX_MESSAGE_TYPE)" + std::to_string (arg));
-}
-
 template<>
 jint
 Enum::ordinal<TOX_PROXY_TYPE> (JNIEnv *env, TOX_PROXY_TYPE valueOf)
@@ -140,19 +102,6 @@ Enum::valueOf<TOX_PROXY_TYPE> (JNIEnv *env, jint ordinal)
   tox4j_fatal ("Invalid enumerator from Java");
 }
 
-template<>
-void
-print_arg<TOX_PROXY_TYPE> (protolog::Value &value, TOX_PROXY_TYPE const &arg)
-{
-  switch (arg)
-    {
-    case TOX_PROXY_TYPE_NONE: value.set_v_string ("TOX_PROXY_TYPE_NONE"); return;
-    case TOX_PROXY_TYPE_HTTP: value.set_v_string ("TOX_PROXY_TYPE_HTTP"); return;
-    case TOX_PROXY_TYPE_SOCKS5: value.set_v_string ("TOX_PROXY_TYPE_SOCKS5"); return;
-    }
-  value.set_v_string ("(TOX_PROXY_TYPE)" + std::to_string (arg));
-}
-
 template<>
 jint
 Enum::ordinal<TOX_SAVEDATA_TYPE> (JNIEnv *env, TOX_SAVEDATA_TYPE valueOf)
@@ -179,19 +128,6 @@ Enum::valueOf<TOX_SAVEDATA_TYPE> (JNIEnv *env, jint ordinal)
   tox4j_fatal ("Invalid enumerator from Java");
 }
 
-template<>
-void
-print_arg<TOX_SAVEDATA_TYPE> (protolog::Value &value, TOX_SAVEDATA_TYPE const &arg)
-{
-  switch (arg)
-    {
-    case TOX_SAVEDATA_TYPE_NONE: value.set_v_string ("TOX_SAVEDATA_TYPE_NONE"); return;
-    case TOX_SAVEDATA_TYPE_TOX_SAVE: value.set_v_string ("TOX_SAVEDATA_TYPE_TOX_SAVE"); return;
-    case TOX_SAVEDATA_TYPE_SECRET_KEY: value.set_v_string ("TOX_SAVEDATA_TYPE_SECRET_KEY"); return;
-    }
-  value.set_v_string ("(TOX_SAVEDATA_TYPE)" + std::to_string (arg));
-}
-
 template<>
 jint
 Enum::ordinal<TOX_USER_STATUS> (JNIEnv *env, TOX_USER_STATUS valueOf)
@@ -217,16 +153,3 @@ Enum::valueOf<TOX_USER_STATUS> (JNIEnv *env, jint ordinal)
     }
   tox4j_fatal ("Invalid enumerator from Java");
 }
-
-template<>
-void
-print_arg<TOX_USER_STATUS> (protolog::Value &value, TOX_USER_STATUS const &arg)
-{
-  switch (arg)
-    {
-    case TOX_USER_STATUS_NONE: value.set_v_string ("TOX_USER_STATUS_NONE"); return;
-    case TOX_USER_STATUS_AWAY: value.set_v_string ("TOX_USER_STATUS_AWAY"); return;
-    case TOX_USER_STATUS_BUSY: value.set_v_string ("TOX_USER_STATUS_BUSY"); return;
-    }
-  value.set_v_string ("(TOX_USER_STATUS)" + std::to_string (arg));
-}
diff --git a/lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h b/lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h
index c860f8a8c..0cd22ade2 100644
--- a/lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h
+++ b/lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h
@@ -311,46 +311,6 @@ JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxFriendSendLossyP
 JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_toxFriendSendLosslessPacket
   (JNIEnv *, jclass, jint, jint, jbyteArray);
 
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jLastLog
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jLastLog
-  (JNIEnv *, jclass);
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jGetCurrentLogSize
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jGetCurrentLogSize
-  (JNIEnv *, jclass);
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jSetMaxLogSize
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jSetMaxLogSize
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jGetMaxLogSize
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jGetMaxLogSize
-  (JNIEnv *, jclass);
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxCoreJni
- * Method:    tox4jSetLogFilter
- * Signature: ([Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxCoreJni_tox4jSetLogFilter
-  (JNIEnv *, jclass, jobjectArray);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/src/main/cpp/ToxCore/lifecycle.cpp b/lib/src/main/cpp/ToxCore/lifecycle.cpp
index 6516b16f8..9f70b3559 100644
--- a/lib/src/main/cpp/ToxCore/lifecycle.cpp
+++ b/lib/src/main/cpp/ToxCore/lifecycle.cpp
@@ -212,29 +212,6 @@ tox_new_unique (Tox_Options const *options, TOX_ERR_NEW *error)
 }
 
 
-static NORETURN void
-tox_finalize ()
-{
-  fprintf (stderr, "This function is only here for register_funcs and should never be called.");
-  abort ();
-}
-
-
-REGISTER_FUNCS (
-#define JAVA_METHOD_REF(x)
-#define CXX_FUNCTION_REF(func)  REGISTER_FUNC (func),
-#include "generated/natives.h"
-#undef CXX_FUNCTION_REF
-#undef JAVA_METHOD_REF
-
-#define CALLBACK(NAME)          REGISTER_FUNC (tox4j_##NAME##_cb),
-#include "tox/generated/core.h"
-#undef CALLBACK
-
-  REGISTER_FUNC (tox_new_unique)
-);
-
-
 /*
  * Class:     im_tox_tox4j_impl_ToxCoreJni
  * Method:    toxNew
diff --git a/lib/src/main/cpp/ToxCrypto/debug.cpp b/lib/src/main/cpp/ToxCrypto/debug.cpp
deleted file mode 100644
index f268c906a..000000000
--- a/lib/src/main/cpp/ToxCrypto/debug.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ToxCrypto.h"
-
-#include <algorithm>
-#include <vector>
-
-template<>
-void
-print_arg<Tox_Pass_Key *> (protolog::Value &value, Tox_Pass_Key *const &key)
-{
-  value.set_v_string ("pass_key");
-}
diff --git a/lib/src/main/cpp/util/ProtoLog.proto b/lib/src/main/cpp/util/ProtoLog.proto
deleted file mode 120000
index 7cbe42a65..000000000
--- a/lib/src/main/cpp/util/ProtoLog.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../proto/ProtoLog.proto
\ No newline at end of file
diff --git a/lib/src/main/cpp/util/debug_log.cpp b/lib/src/main/cpp/util/debug_log.cpp
deleted file mode 100644
index b4d718bea..000000000
--- a/lib/src/main/cpp/util/debug_log.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-#include "util/debug_log.h"
-
-#include <tox/core.h>
-
-#include <algorithm>
-#include <cctype>
-#include <cstdlib>
-#include <iostream>
-#include <sstream>
-#include <map>
-
-#include <jni.h>
-
-
-/**
- * Maximum number of bytes logged in a "bytes" value.
- */
-static std::size_t const MAX_DATA_LOG_LENGTH = 128;
-
-
-/****************************************************************************
- *
- * :: Log and log entry.
- *
- ****************************************************************************/
-
-
-// Global log.
-JniLog jni_log;
-
-
-struct JniLog::data
-{
-  int max_size = 100;
-  std::recursive_mutex mutex;
-  protolog::JniLog log;
-  std::vector<std::string> filters;
-};
-
-
-JniLog::Entry::Entry (data *log, protolog::JniLogEntry *entry, std::unique_lock<std::recursive_mutex> lock)
-  : log_ (log)
-  , entry_ (entry)
-  , lock_ (std::move (lock))
-{
-}
-
-
-JniLog::Entry::Entry(Entry &&rhs)
-  : log_ (rhs.log_)
-  , entry_ (rhs.entry_)
-  , lock_ (std::move (rhs.lock_))
-{
-  rhs.log_ = nullptr;
-  rhs.entry_ = nullptr;
-}
-
-
-JniLog::Entry::~Entry ()
-{
-  // Check if this entry needs to be filtered out.
-  if (entry_ && std::find (log_->filters.begin (), log_->filters.end (), entry_->name ()) != log_->filters.end ())
-    {
-      auto *entries = log_->log.mutable_entries ();
-
-      // Search for the current entry in the recently added entries.
-      auto found = std::find_if (entries->rbegin (), entries->rend (),
-        [this](auto const &element)
-        { return &element == entry_; }
-      );
-
-      // This would mean the log was cleared before the mutex was unlocked.
-      assert (found != entries->rend ());
-
-      // Remove the entry from the log, moving the ones after it to the front
-      // by one place. These should not be many, usually just one. During a
-      // single entry's lifetime, only event processing can happen recursively.
-      int deleted_index = entries->rend () - found - 1;
-      entries->DeleteSubrange (deleted_index, 1);
-    }
-}
-
-
-JniLog::JniLog ()
-  : self (make_unique<data> ())
-{
-}
-
-JniLog::~JniLog ()
-{
-}
-
-
-JniLog::Entry
-JniLog::new_entry ()
-{
-  // No lock for max_size.
-  if (self->max_size == 0)
-    return { };
-
-  // Acquire a lock and pass it to the Entry.
-  std::unique_lock<std::recursive_mutex> lock (self->mutex);
-  if (self->log.entries_size () >= self->max_size)
-    // If the log is full, unlock right away and return null.
-    return nullptr;
-  return JniLog::Entry (self.get (), self->log.add_entries (), std::move (lock));
-}
-
-std::vector<char>
-JniLog::clear ()
-{
-  std::lock_guard<std::recursive_mutex> lock (self->mutex);
-
-  // Try to update log entries with numeric names.
-  for (protolog::JniLogEntry &entry : *self->log.mutable_entries ())
-    {
-      assert (!entry.name ().empty ());
-      if (std::isdigit (entry.name ()[0]))
-        {
-          std::istringstream in (entry.name ());
-          std::uintptr_t pointer;
-          in >> pointer;
-          entry.set_name (get_func_name (pointer));
-        }
-    }
-
-  std::vector<char> buffer (self->log.ByteSizeLong ());
-  self->log.SerializeToArray (buffer.data (), buffer.size ());
-  self->log.Clear ();
-
-  return buffer;
-}
-
-bool
-JniLog::empty () const
-{
-  return size () == 0;
-}
-
-void
-JniLog::max_size (int max_size)
-{
-  self->max_size = max_size;
-}
-
-int
-JniLog::max_size () const
-{
-  return self->max_size;
-}
-
-int
-JniLog::size () const
-{
-  std::lock_guard<std::recursive_mutex> lock (self->mutex);
-  return self->log.entries_size ();
-}
-
-void
-JniLog::filter (std::vector<std::string> filters)
-{
-  std::lock_guard<std::recursive_mutex> lock (self->mutex);
-  self->filters = std::move (filters);
-}
-
-
-/****************************************************************************
- *
- * :: Function name registry.
- *
- ****************************************************************************/
-
-
-/**
- * The global singleton is in a function because otherwise static
- * initialisation order does not guarantee the map to be initialised when it
- * is accessed from another translation unit calling register_func.
- */
-static std::map<std::uintptr_t, std::string const> &
-func_names ()
-{
-  static std::map<std::uintptr_t, std::string const> func_names;
-  return func_names;
-}
-
-
-bool
-register_func (std::uintptr_t func, std::string const &name)
-{
-  auto &names = func_names ();
-  assert (names.find (func) == names.end ());
-  names.insert (std::make_pair (func, name));
-  return true;
-}
-
-
-std::string
-get_func_name (std::uintptr_t func)
-{
-  auto &names = func_names ();
-  auto found = names.find (func);
-  if (found != names.end ())
-    return found->second;
-  else
-    return std::to_string (func);
-}
-
-
-void
-print_func (protolog::JniLogEntry &log_entry, std::uintptr_t func)
-{
-  log_entry.set_name (get_func_name (func));
-}
-
-
-/****************************************************************************
- *
- * :: Common print_arg specialisations for C++ and JNI types.
- *
- ****************************************************************************/
-
-
-template<typename Arg>
-void
-print_arg (protolog::Value &value, Arg const &arg)
-{
-  value.set_v_sint64 (arg);
-}
-
-template void print_arg<         bool     > (protolog::Value &,          bool      const &);
-template void print_arg<  signed char     > (protolog::Value &,   signed char      const &);
-template void print_arg<unsigned char     > (protolog::Value &, unsigned char      const &);
-template void print_arg<  signed short    > (protolog::Value &,   signed short     const &);
-template void print_arg<unsigned short    > (protolog::Value &, unsigned short     const &);
-template void print_arg<  signed int      > (protolog::Value &,   signed int       const &);
-template void print_arg<unsigned int      > (protolog::Value &, unsigned int       const &);
-template void print_arg<  signed long     > (protolog::Value &,   signed long      const &);
-template void print_arg<unsigned long     > (protolog::Value &, unsigned long      const &);
-template void print_arg<  signed long long> (protolog::Value &,   signed long long const &);
-template void print_arg<unsigned long long> (protolog::Value &, unsigned long long const &);
-
-template<>
-void
-print_arg<char const *> (protolog::Value &value, char const *const &data)
-{
-  if (data == nullptr)
-    value.set_v_string ("<null>");
-  else
-    value.set_v_string (data);
-}
-
-template<>
-void
-print_arg<uint8_t const *> (protolog::Value &value, uint8_t const *const &data)
-{
-  if (data == nullptr)
-    value.set_v_string ("<null>");
-  else
-    value.set_v_string ("byte[]");
-}
-
-void
-print_arg (protolog::Value &value, uint8_t const *data, std::size_t length)
-{
-  if (data == nullptr)
-    value.set_v_string ("<null>");
-  else
-    {
-      value.set_v_bytes (data, std::min (length, MAX_DATA_LOG_LENGTH));
-      if (length > MAX_DATA_LOG_LENGTH)
-        value.set_truncated (length);
-    }
-}
-
-void
-print_arg (protolog::Value &value, int16_t const *data, std::size_t length)
-{
-  if (data == nullptr)
-    value.set_v_string ("<null>");
-  else
-    value.set_v_string ("short[" + std::to_string (length) + "]");
-}
-
-template<>
-void
-print_arg<std::vector<uint8_t>> (protolog::Value &value, std::vector<uint8_t> const &data)
-{
-  print_arg (value, data.data (), data.size ());
-}
-
-template<>
-void
-print_arg<std::vector<jint>> (protolog::Value &value, std::vector<jint> const &data)
-{
-  value.set_v_string ("int[" + std::to_string (data.size ()) + "]");
-}
diff --git a/lib/src/main/cpp/util/debug_log.h b/lib/src/main/cpp/util/debug_log.h
index 9697c170f..d8804b7f1 100644
--- a/lib/src/main/cpp/util/debug_log.h
+++ b/lib/src/main/cpp/util/debug_log.h
@@ -9,160 +9,10 @@
 #include "util/unused.h"
 #include "util/wrap_void.h"
 
-#include "ProtoLog.pb.h"
-
 #include <chrono>
 #include <memory>
 #include <mutex>
 
-namespace protolog = im::tox::tox4j::impl::jni::proto;
-
-
-/****************************************************************************
- *
- * print_arg: Writes a single argument or return value to a Value.
- *
- ****************************************************************************/
-
-
-/**
- * General print_arg function for converting any C value to a protolog::Value.
- *
- * This function is specialised for every possible type in C++ function calls.
- * For user-defined types, the print_arg function must be specialised as well.
- */
-template<typename Arg>
-void print_arg (protolog::Value &value, Arg const &arg);
-
-/**
- * Overload for byte and short arrays of known length. In this case, the values
- * are put in a "bytes" member of the protobuf.
- */
-void print_arg (protolog::Value &value, uint8_t const *data, std::size_t length);
-void print_arg (protolog::Value &value, int16_t const *data, std::size_t length);
-
-/**
- * Overload for arrays with static bounds.
- */
-template<typename T, std::size_t N>
-void
-print_arg (protolog::Value &value, T const (&array)[N])
-{
-  print_arg (value, array, N);
-}
-
-/**
- * The overload for unique_ptr just calls print_arg on the raw pointer.
- */
-template<typename Arg, typename ArgDeleter>
-void
-print_arg (protolog::Value &value, std::unique_ptr<Arg, ArgDeleter> const &arg)
-{
-  print_arg (value, arg.get ());
-}
-
-/**
- * An overload for Java arrays passed to C functions without their size.
- */
-template<
-  typename JType,
-  typename CType,
-  typename JavaArray,
-  JType *(JNIEnv::*GetArrayElements) (JavaArray, jboolean *),
-  void (JNIEnv::*ReleaseArrayElements) (JavaArray, JType *, jint)
->
-void
-print_arg (protolog::Value &value, detail::MakeArrayFromJava<JType, CType, JavaArray, GetArrayElements, ReleaseArrayElements> const &array)
-{
-  print_arg (value, array.data (), array.size ());
-}
-
-/**
- * For wrapped_value, we need two overloads, one for the general case and one
- * for void.
- */
-template<typename Arg>
-void
-print_arg (protolog::Value &value, wrapped_value<Arg> const &arg)
-{
-  // Don't use arg.unwrap() here, because it moves the value out.
-  print_arg (value, arg.value);
-}
-
-/**
- * The overload for wrapped_value<void> leaves the Value empty.
- */
-static inline void
-print_arg (protolog::Value &value, wrapped_value<void> const &arg)
-{
-  unused (value, arg);
-}
-
-
-/****************************************************************************
- *
- * print_member: Adds a name/value pair to an object type Value.
- *
- ****************************************************************************/
-
-
-template<typename ...Args>
-void
-print_member (protolog::Struct &object, char const *name, Args ...member_args)
-{
-  print_arg ((*object.mutable_members ())[name], member_args...);
-}
-
-
-/****************************************************************************
- *
- * print_args: Call print_arg on all arguments and adds them to the log entry.
- *
- ****************************************************************************/
-
-
-/**
- * Recursion end.
- */
-static inline void
-print_args (protolog::JniLogEntry &log_entry)
-{
-  unused (log_entry);
-}
-
-/**
- * Recursive function to print_arg every argument.
- *
- * This forward declaration exists so that the data+size overload can call it.
- */
-template<typename ...Args>
-void print_args (protolog::JniLogEntry &log_entry, Args const &...args);
-
-/**
- * Overload for byte arrays of known size. This is declared before the
- * recursive function below so that it will be in the overload set within
- * the default function.
- */
-template<typename ...Args>
-void
-print_args (protolog::JniLogEntry &log_entry,
-            uint8_t const *data, std::size_t size, Args const &...args)
-{
-  protolog::Value *value = log_entry.add_arguments ();
-  print_arg (*value, data, size);
-  print_args (log_entry, args...);
-}
-
-template<typename Arg0, typename ...Args>
-void
-print_args (protolog::JniLogEntry &log_entry,
-            Arg0 const &arg0, Args const &...args)
-{
-  protolog::Value *value = log_entry.add_arguments ();
-  print_arg (*value, arg0);
-  print_args (log_entry, args...);
-}
-
 
 /****************************************************************************
  *
@@ -176,12 +26,6 @@ print_args (protolog::JniLogEntry &log_entry,
  */
 std::string get_func_name (uintptr_t func);
 
-/**
- * Look up the name of a function and set it in the log entry.
- */
-void print_func (protolog::JniLogEntry &log_entry, uintptr_t func);
-
-
 template<typename R, typename ...Args>
 std::string
 get_func_name (R func (Args...))
@@ -234,101 +78,6 @@ register_funcs (Func func, Name const &name, Funcs const &...funcs)
 #define REGISTER_FUNC(func) reinterpret_cast<uintptr_t> (func), #func
 
 
-/****************************************************************************
- *
- * JniLog and LogEntry
- *
- ****************************************************************************/
-
-
-/**
- * The main public interface for creating log entries, serialising the log,
- * and configuring the logging behaviour.
- *
- * Every member function locks the JniLog instance mutex.
- */
-struct JniLog
-{
-  // Private data is hidden in the implementation file.
-  struct data;
-
-  /**
-   * The log entry wraps a protolog::JniLogEntry pointer and a mutex lock guard,
-   * which is created when a new entry is created, and held until the Entry goes
-   * out of scope. This ensures that any writes to the log entry are done before
-   * any other operations (in particular, clear()) occur.
-   *
-   * It also contains some pointer operators ->, *, and bool conversion so it
-   * behaves roughly like a JniLogEntry pointer.
-   */
-  struct Entry
-  {
-    Entry (Entry &&);
-
-    Entry (data *log = nullptr, protolog::JniLogEntry *entry = nullptr, std::unique_lock<std::recursive_mutex> lock = { });
-    ~Entry ();
-
-    protolog::JniLogEntry *operator -> () const { return  entry_; }
-    protolog::JniLogEntry &operator *  () const { return *entry_; }
-    explicit operator bool () const { return entry_; }
-
-  private:
-    data *log_;
-    protolog::JniLogEntry *entry_;
-    std::unique_lock<std::recursive_mutex> lock_;
-  };
-
-  JniLog ();
-  ~JniLog ();
-
-  /**
-   * Create a new log entry. Only one thread can operate on the log at the
-   * same time. This function does not acquire a lock when max_size is set
-   * to 0.
-   */
-  Entry new_entry ();
-
-  /**
-   * Serialise the log to bytes and then delete all log entries. After this,
-   * empty() will be true.
-   */
-  std::vector<char> clear ();
-
-  /**
-   * Return whether the size of the log is 0.
-   */
-  bool empty () const;
-
-  /**
-   * Set/get the maximum size of the log.
-   *
-   * These functions do not acquire the lock.
-   */
-  void max_size (int max_size);
-  int max_size () const;
-
-  /**
-   * Get the number of entries in the log.
-   */
-  int size () const;
-
-  /**
-   * Set filters to avoid logging certain calls.
-   */
-  void filter (std::vector<std::string> filters);
-
-private:
-  std::unique_ptr<data> self;
-};
-
-
-/**
- * We keep one global log for the process, so we don't need to store it
- * anywhere, and so it can be accessed from the LogEntry helper class.
- */
-extern JniLog jni_log;
-
-
 /**
  * Helper class to create a log entry in jni_log and write the function call
  * arguments and result to the new entry.
@@ -348,12 +97,6 @@ struct LogEntry
       std::is_function<std::remove_pointer_t<Func>>::value,
       "The first argument to LogEntry must be a function or instance number."
     );
-
-    if (entry)
-      {
-        print_func (*entry, reinterpret_cast<uintptr_t> (func));
-        print_args (*entry, args...);
-      }
   }
 
 
@@ -367,34 +110,8 @@ struct LogEntry
   auto
   print_result (FuncT func, Args &&...args)
   {
-    if (entry)
-      {
-        auto start = std::chrono::system_clock::now ();
-        auto result = wrap_void (func, std::forward<Args> (args)...);
-        auto end = std::chrono::system_clock::now ();
-
-        using std::chrono::duration_cast;
-        using std::chrono::seconds;
-        using std::chrono::nanoseconds;
-
-        auto start_time = start.time_since_epoch ();
-
-        protolog::Timestamp *timestamp = entry->mutable_timestamp ();
-        timestamp->set_seconds (duration_cast<seconds> (start_time).count ());
-        timestamp->set_nanos (duration_cast<nanoseconds> (start_time).count () % 1000000000);
-
-        entry->set_elapsed_nanos (duration_cast<nanoseconds> (end - start).count ());
-
-        print_arg (*entry->mutable_result (), result);
-
-        return result;
-      }
-
     return wrap_void (func, std::forward<Args> (args)...);
   }
-
-protected:
-  JniLog::Entry const entry = jni_log.new_entry ();
 };
 
 struct InstanceLogEntry
@@ -407,8 +124,6 @@ struct InstanceLogEntry
   InstanceLogEntry (int instanceNumber, Func func, Args const &...args)
     : LogEntry (func, args...)
   {
-    if (entry)
-      entry->set_instance_number (instanceNumber);
   }
 };
 
diff --git a/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java
index ab73de6e6..535f2e57a 100644
--- a/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java
+++ b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java
@@ -81,10 +81,4 @@ static native void toxFriendSendLossyPacket(int instanceNumber, int friendNumber
       throws ToxFriendCustomPacketException;
   static native void toxFriendSendLosslessPacket(int instanceNumber, int friendNumber, byte[] data)
       throws ToxFriendCustomPacketException;
-
-  static native byte[] tox4jLastLog();
-  static native int tox4jGetCurrentLogSize();
-  static native void tox4jSetMaxLogSize(int maxSize);
-  static native int tox4jGetMaxLogSize();
-  static native void tox4jSetLogFilter(String[] filter);
 }
diff --git a/lib/src/main/proto/ProtoLog.proto b/lib/src/main/proto/ProtoLog.proto
deleted file mode 100644
index c4f93395c..000000000
--- a/lib/src/main/proto/ProtoLog.proto
+++ /dev/null
@@ -1,64 +0,0 @@
-syntax = "proto3";
-
-package im.tox.tox4j.impl.jni.proto;
-
-option java_multiple_files = true;
-option optimize_for = LITE_RUNTIME;
-
-// struct timeval from <sys/time.h> representing a point in time.
-message Timestamp {
-  int64 seconds = 1;
-  int32 nanos = 2;
-}
-
-
-// For aggregates, this contains the members. It can be a tree if the object
-// member itself is also an object.
-message Struct {
-  map<string, Value> members = 1;
-}
-
-
-// A single argument or return value.
-message Value {
-  uint32 truncated = 1;
-  oneof v {
-    sint64 v_sint64 = 2;
-    string v_string = 3;
-    bytes  v_bytes  = 4;
-    Struct v_object = 5;
-  }
-}
-
-
-// A single log entry representing one native function call.
-message JniLogEntry {
-  // The called function name or address.
-  string name = 1;
-
-  // Instance number for the Tox or ToxAV instance.
-  uint32 instance_number = 2;
-
-  // All the arguments to the function in order. These may contain out
-  // parameters, in which case the result will not be logged.
-  // TODO(iphydf): Infer out parameters from constness and log them anyway.
-  repeated Value arguments = 3;
-
-  // Return value of the called function.
-  Value result = 4;
-
-  // Exact point in time (seconds and nanoseconds) when the function
-  // began processing.
-  Timestamp timestamp = 5;
-
-  // Time spent inside the actual native function in nanoseconds. This does
-  // not include JNI overhead and the C++ code around it. It is purely the
-  // time spent in the tox function.
-  uint32 elapsed_nanos = 6;
-}
-
-
-// Top-level log containing all the log entries.
-message JniLog {
-  repeated JniLogEntry entries = 1;
-}