diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 27a2242e..f4415fd2 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -22,12 +22,3 @@ add_subdirectory(./stb)
 add_subdirectory(./libwebp)
 add_subdirectory(./qoi)
 
-if (NOT TARGET nlohmann_json::nlohmann_json)
-	FetchContent_Declare(json
-		URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
-		URL_HASH SHA256=d6c65aca6b1ed68e7a182f4757257b107ae403032760ed6ef121c9d55e81757d
-		EXCLUDE_FROM_ALL
-	)
-	FetchContent_MakeAvailable(json)
-endif()
-
diff --git a/external/solanaceae_tox b/external/solanaceae_tox
index ce81ef7c..d5c1bf07 160000
--- a/external/solanaceae_tox
+++ b/external/solanaceae_tox
@@ -1 +1 @@
-Subproject commit ce81ef7cf7cea2fe2091912c9eafe787cbba6100
+Subproject commit d5c1bf07db96143939d47e3c49cbc4fef308b3d3
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 103d7431..2d371188 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,13 +6,6 @@ add_executable(tomato
 	./main.cpp
 	./icon.rc
 
-
-	# TODO: mfs leftovers, need to move
-	./json/tox_message_components.hpp # TODO: move
-	./fragment_store/register_mfs_json_tox_message_components.hpp
-	./fragment_store/register_mfs_json_tox_message_components.cpp
-
-
 	./screen.hpp
 	./start_screen.hpp
 	./start_screen.cpp
diff --git a/src/fragment_store/register_mfs_json_tox_message_components.cpp b/src/fragment_store/register_mfs_json_tox_message_components.cpp
deleted file mode 100644
index fbeb979c..00000000
--- a/src/fragment_store/register_mfs_json_tox_message_components.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "./register_mfs_json_tox_message_components.hpp"
-
-#include "../json/tox_message_components.hpp"
-#include "solanaceae/message3/message_serializer.hpp"
-
-void registerMFSJsonToxMessageComponents(MessageSerializerNJ& msnj) {
-	msnj.registerSerializer<Message::Components::ToxGroupMessageID>();
-	msnj.registerDeserializer<Message::Components::ToxGroupMessageID>();
-}
-
diff --git a/src/fragment_store/register_mfs_json_tox_message_components.hpp b/src/fragment_store/register_mfs_json_tox_message_components.hpp
deleted file mode 100644
index ea801df0..00000000
--- a/src/fragment_store/register_mfs_json_tox_message_components.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <solanaceae/message3/message_serializer.hpp>
-
-void registerMFSJsonToxMessageComponents(MessageSerializerNJ& msnj);
-
diff --git a/src/json/tox_message_components.hpp b/src/json/tox_message_components.hpp
deleted file mode 100644
index 09ebbdc2..00000000
--- a/src/json/tox_message_components.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <solanaceae/util/utils.hpp>
-
-#include <solanaceae/tox_messages/components.hpp>
-
-#include <nlohmann/json.hpp>
-
-namespace Message::Components {
-
-	// TODO: friend msg id, does not have the same qualities
-	NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(ToxGroupMessageID, id)
-	// TODO: transfer stuff, needs content rewrite
-
-} // Message::Components
-
diff --git a/src/main_screen.cpp b/src/main_screen.cpp
index 96233813..79f27dc4 100644
--- a/src/main_screen.cpp
+++ b/src/main_screen.cpp
@@ -1,8 +1,7 @@
 #include "./main_screen.hpp"
 
 #include <solanaceae/message3/nj/message_components_serializer.hpp>
-#include "./fragment_store/register_mfs_json_tox_message_components.hpp"
-#include "solanaceae/message3/message_serializer.hpp"
+#include <solanaceae/tox_messages/nj/tox_message_components_serializer.hpp>
 
 #include <solanaceae/contact/components.hpp>
 
@@ -40,7 +39,7 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	tel.subscribeAll(tc);
 
 	registerMessageComponents(msnj);
-	registerMFSJsonToxMessageComponents(msnj);
+	registerToxMessageComponents(msnj);
 
 	conf.set("tox", "save_file_path", save_path);