diff --git a/client/scenes/clean_up.cpp b/client/scenes/clean_up.cpp
index 1be9e5c..c602014 100644
--- a/client/scenes/clean_up.cpp
+++ b/client/scenes/clean_up.cpp
@@ -85,7 +85,7 @@ void CleanUp::Update() {
 		SetNextScene(SceneList::MAINMENU);
 	}
 
-	//BUGFIX: Eat incoming packets
+	//Eat incoming packets
 	while(network.Receive());
 }
 
diff --git a/client/scenes/lobby_menu.cpp b/client/scenes/lobby_menu.cpp
index 8a1c4d1..92ce5d1 100644
--- a/client/scenes/lobby_menu.cpp
+++ b/client/scenes/lobby_menu.cpp
@@ -64,7 +64,7 @@ LobbyMenu::LobbyMenu(int* const argClientIndex, int* const argAccountIndex):
 	//set the server list's position
 	listBox = {300, 50, 200, font.GetCharH()};
 
-	//BUGFIX: Eat incoming packets
+	//Eat incoming packets
 	while(network.Receive());
 
 	//Initial broadcast
diff --git a/common/network/udp_network_utility.cpp b/common/network/udp_network_utility.cpp
index 6a2d243..e677854 100644
--- a/common/network/udp_network_utility.cpp
+++ b/common/network/udp_network_utility.cpp
@@ -26,7 +26,7 @@
 
 #include <stdexcept>
 
-//BUGFIX: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
+//NOTE: memset() is used before sending a packet to remove old data; you don't want to send sensitive data over the network
 //NOTE: don't confuse SerialPacketBase with UDPpacket
 
 void UDPNetworkUtility::Open(int port) {
diff --git a/server/server_methods.cpp b/server/server_methods.cpp
index 8c5a623..2cc3b31 100644
--- a/server/server_methods.cpp
+++ b/server/server_methods.cpp
@@ -35,8 +35,6 @@ void ServerApplication::HandlePing(ServerPacket* const argPacket) {
 
 void ServerApplication::HandlePong(ServerPacket* const argPacket) {
 	//find and update the specified client
-
-	//BUGFIX: running multiple clients on one computer will result in matching host values; check the ports too
 	for (auto& it : clientMap) {
 		if (it.second.GetAddress().host == argPacket->srcAddress.host &&
 			it.second.GetAddress().port == argPacket->srcAddress.port
diff --git a/todo.txt b/todo.txt
index 77e8d80..1583f88 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1,3 @@
-TODO: Remove the BUGFIX tags
-TODO: Rejection messages
 TODO: The error handling is terrible
 TODO: Get the rooms working, even if only via hotkeys
 TODO: Fix shoddy movement