diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 0104368367b0ade0bc5719f05d4d56a42c67c315..d673a59ec7d30597fadb3a53c11dfdfd6fba2d4f 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1758,7 +1758,6 @@ void NetUpdate(void)
 		M_Ticker();
 		CON_Ticker();
 	}
-	FiletxTicker();
 }
 
 /** Returns the number of players playing.
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 53af7f37534daccb343a8b0c26e40f53a9e552d6..87932761d6d5d400d4c1027aa05cf89448de1c25 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -301,7 +301,7 @@ void Got_RequestFilePak(INT32 node)
 }
 
 // client check if the fileneeded aren't already loaded or on the disk
-INT32 CL_CheckFiles(void)
+static INT32 CL_CheckFiles(void)
 {
 	INT32 i, j;
 	char wadfilename[MAX_WADPATH];
@@ -545,162 +545,7 @@ static void EndSend(INT32 node)
 	filetosend--;
 }
 
-#define PACKETPERTIC net_bandwidth/(TICRATE*software_MAXPACKETLENGTH)
-
-void FiletxTicker(void)
-{
-	static INT32 currentnode = 0;
-	filetx_pak *p;
-	size_t size;
-	filetx_t *f;
-	INT32 packetsent = PACKETPERTIC, ram, i;
-
-	if (!filetosend)
-		return;
-	if (!packetsent)
-		packetsent++;
-	// (((sendbytes-nowsentbyte)*TICRATE)/(I_GetTime()-starttime)<(UINT32)net_bandwidth)
-	while (packetsent-- && filetosend != 0)
-	{
-		for (i = currentnode, ram = 0; ram < MAXNETNODES;
-			i = (i+1) % MAXNETNODES, ram++)
-		{
-			if (transfer[i].txlist)
-				goto found;
-		}
-		// no transfer to do
-		I_Error("filetosend=%d but no filetosend found\n", filetosend);
-	found:
-		currentnode = (i+1) % MAXNETNODES;
-		f = transfer[i].txlist;
-		ram = f->ram;
-
-		if (!transfer[i].currentfile) // file not already open
-		{
-			if (!ram)
-			{
-				long filesize;
-
-				transfer[i].currentfile =
-					fopen(f->filename, "rb");
-
-				if (!transfer[i].currentfile)
-					I_Error("File %s does not exist",
-						f->filename);
-
-				fseek(transfer[i].currentfile, 0, SEEK_END);
-				filesize = ftell(transfer[i].currentfile);
-
-				// Nobody wants to transfer a file bigger
-				// than 4GB!
-				if (filesize >= LONG_MAX)
-					I_Error("filesize of %s is too large", f->filename);
-				if (-1 == filesize)
-					I_Error("Error getting filesize of %s", f->filename);
-
-				f->size = (UINT32)filesize;
-				fseek(transfer[i].currentfile, 0, SEEK_SET);
-			}
-			else
-				transfer[i].currentfile = (FILE *)1;
-			transfer[i].position = 0;
-		}
-
-		p = &netbuffer->u.filetxpak;
-		size = software_MAXPACKETLENGTH - (FILETXHEADER + BASEPACKETSIZE);
-		if (f->size-transfer[i].position < size)
-			size = f->size-transfer[i].position;
-		if (ram)
-			M_Memcpy(p->data, &f->filename[transfer[i].position], size);
-		else if (fread(p->data, 1, size, transfer[i].currentfile) != size)
-			I_Error("FiletxTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->filename, transfer[i].position, strerror(ferror(transfer[i].currentfile)));
-		p->position = LONG(transfer[i].position);
-		// put flag so receiver know the totalsize
-		if (transfer[i].position + size == f->size)
-			p->position |= LONG(0x80000000);
-		p->fileid = f->fileid;
-		p->size = SHORT((UINT16)size);
-		netbuffer->packettype = PT_FILEFRAGMENT;
-		if (!HSendPacket(i, true, 0, FILETXHEADER + size)) // reliable SEND
-		{ // not sent for some odd reason, retry at next call
-			if (!ram)
-				fseek(transfer[i].currentfile,transfer[i].position,SEEK_SET);
-			// exit the while (can't send this one so why should i send the next?)
-			break;
-		}
-		else // success
-		{
-			transfer[i].position = (UINT32)(size+transfer[i].position);
-			if (transfer[i].position == f->size) //  finish ?
-				EndSend(i);
-		}
-	}
-}
-
-void Got_Filetxpak(void)
-{
-	INT32 filenum = netbuffer->u.filetxpak.fileid;
-	static INT32 filetime = 0;
-
-	if (filenum >= fileneedednum)
-	{
-		DEBFILE(va("fileframent not needed %d>%d\n",filenum, fileneedednum));
-		return;
-	}
-
-	if (fileneeded[filenum].status == FS_REQUESTED)
-	{
-		if (fileneeded[filenum].phandle) I_Error("Got_Filetxpak: allready open file\n");
-			fileneeded[filenum].phandle = fopen(fileneeded[filenum].filename, "wb");
-		if (!fileneeded[filenum].phandle) I_Error("Can't create file %s: %s",fileneeded[filenum].filename, strerror(errno));
-			CONS_Printf("\r%s...\n",fileneeded[filenum].filename);
-		fileneeded[filenum].currentsize = 0;
-		fileneeded[filenum].status = FS_DOWNLOADING;
-	}
-
-	if (fileneeded[filenum].status == FS_DOWNLOADING)
-	{
-		UINT32 pos = LONG(netbuffer->u.filetxpak.position);
-		UINT16 size = SHORT(netbuffer->u.filetxpak.size);
-		// use a special tric to know when file is finished (not allways used)
-		// WARNING: filepak can arrive out of order so don't stop now !
-		if (pos & 0x80000000)
-		{
-			pos &= ~0x80000000;
-			fileneeded[filenum].totalsize = pos + size;
-		}
-		// we can receive packet in the wrong order, anyway all os support gaped file
-		fseek(fileneeded[filenum].phandle,pos,SEEK_SET);
-		if (fwrite(netbuffer->u.filetxpak.data,size,1,fileneeded[filenum].phandle)!=1)
-			I_Error("Can't write to %s: %s\n",fileneeded[filenum].filename, strerror(ferror(fileneeded[filenum].phandle)));
-		fileneeded[filenum].currentsize += size;
-
-		// finished?
-		if (fileneeded[filenum].currentsize == fileneeded[filenum].totalsize)
-		{
-			fclose(fileneeded[filenum].phandle);
-			fileneeded[filenum].phandle = NULL;
-			fileneeded[filenum].status = FS_FOUND;
-			CONS_Printf(M_GetText("Downloading %s...(done)\n"),
-				fileneeded[filenum].filename);
-		}
-	}
-	else
-		I_Error("Received a file not requested\n");
-	// send ack back quickly
-
-	if (++filetime == 3)
-	{
-		Net_SendAcks(servernode);
-		filetime = 0;
-	}
-
-#ifdef CLIENT_LOADINGSCREEN
-	lastfilenum = filenum;
-#endif
-}
-
-void AbortSendFiles(INT32 node)
+static void AbortSendFiles(INT32 node)
 {
 	while (transfer[node].txlist)
 		EndSend(node);
diff --git a/src/d_netfil.h b/src/d_netfil.h
index 224ec4dbba0627d150d8abc2d9103e514ee64a9f..c92d733287257ca87ef77456ffa7200c129176e5 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -58,23 +58,14 @@ UINT8 *PutFileNeeded(void);
 void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr);
 void CL_PrepareDownloadSaveGame(const char *tmpsave);
 
-// check file list in wadfiles return 0 when a file is not found
-//                                    1 if all file are found
-//                                    2 if you cannot connect (different wad version or
-//                                                   no enought space to download files)
-INT32 CL_CheckFiles(void);
 void CL_LoadServerFiles(void);
 void SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
 	UINT8 fileid);
 
-void FiletxTicker(void);
-void Got_Filetxpak(void);
-
 boolean CL_CheckDownloadable(void);
 boolean CL_SendRequestFile(void);
 void Got_RequestFilePak(INT32 node);
 
-void AbortSendFiles(INT32 node);
 void CloseNetFile(void);
 
 boolean fileexist(char *filename, time_t ptime);
diff --git a/src/g_input.c b/src/g_input.c
index e9010b39d0580f14000bd802a61aabfe063efda7..f918e91a7451d2e9b5ddae97fb2394bda537bde9 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -16,7 +16,6 @@
 #include "g_input.h"
 #include "keys.h"
 #include "hu_stuff.h" // need HUFONT start & end
-#include "d_net.h"
 #include "console.h"
 
 #define MAXMOUSESENSITIVITY 100 // sensitivity steps
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 6eaf31c4affdacf633834ee2a4979da02875e30a..576d7bc4f00b3cdc9ab326e51059b3b61aab737c 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -19,7 +19,6 @@
 #include "r_local.h"
 #include "p_local.h"
 #include "p_setup.h"
-#include "d_net.h"
 
 #include "m_cheat.h"
 #include "m_menu.h"
@@ -1077,10 +1076,6 @@ void OP_ObjectplaceMovement(player_t *player)
 	if (!player->climbing && (netgame || !cv_analog.value || (player->pflags & PF_SPINNING)))
 		player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
 
-	ticruned++;
-	if (!(cmd->angleturn & TICCMD_RECEIVED))
-		ticmiss++;
-
 	if (cmd->buttons & BT_JUMP)
 		player->mo->z += FRACUNIT*cv_speed.value;
 	else if (cmd->buttons & BT_USE)
diff --git a/src/m_menu.c b/src/m_menu.c
index f25b902035de62ac90268b6b2a0c72c304f5b9ba..9ef4c3bfa4574bb6151eef55341262d3ef681338 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -46,7 +46,6 @@
 #include "hardware/hw_main.h"
 #endif
 
-#include "d_net.h"
 #include "mserv.h"
 #include "m_misc.h"
 #include "m_anigif.h"
diff --git a/src/mserv.c b/src/mserv.c
index 568474d73e1219d46395dc4e832419ababab81a9..2dec57ff6ac1d9f159cb1989965dd00910a1cdeb 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -80,11 +80,8 @@
 #include "doomstat.h"
 #include "doomdef.h"
 #include "command.h"
-#include "i_net.h"
 #include "console.h"
 #include "mserv.h"
-#include "d_net.h"
-#include "i_tcp.h"
 #include "i_system.h"
 #include "byteptr.h"
 #include "m_menu.h"
@@ -838,16 +835,7 @@ const char *GetMasterServerIP(void)
 
 void MSOpenUDPSocket(void)
 {
-#ifndef NONET
-	if (I_NetMakeNodewPort)
-	{
-		// If it's already open, there's nothing to do.
-		if (msnode < 0)
-			msnode = I_NetMakeNodewPort(GetMasterServerIP(), GetMasterServerPort());
-	}
-	else
-#endif
-		msnode = -1;
+	msnode = -1;
 }
 
 void MSCloseUDPSocket(void)
@@ -916,38 +904,7 @@ static inline void SendPingToMasterServer(void)
 
 void SendAskInfoViaMS(INT32 node, tic_t asktime)
 {
-	const char *address;
-	UINT16 port;
-	char *inip;
-	ms_holepunch_packet_t mshpp;
-
-	MSOpenUDPSocket();
-
-	// This must be called after calling MSOpenUDPSocket, due to the
-	// static buffer.
-	address = I_GetNodeAddress(node);
-
-	// no address?
-	if (!address)
-		return;
-
-	// Copy the IP address into the buffer.
-	inip = mshpp.ip;
-	while(*address && *address != ':') *inip++ = *address++;
-	*inip = '\0';
-
-	// Get the port.
-	port = (UINT16)(*address++ ? atoi(address) : 0);
-	mshpp.port = SHORT(port);
-
-	// Set the time for ping calculation.
-	mshpp.time = LONG(asktime);
-
-	// Send to the MS.
-	M_Memcpy(netbuffer, &mshpp, sizeof(mshpp));
-	doomcom->datalength = sizeof(ms_holepunch_packet_t);
-	doomcom->remotenode = (INT16)msnode;
-	I_NetSend();
+	// NET TODO
 }
 
 void UnregisterServer(void)
diff --git a/src/p_user.c b/src/p_user.c
index 88bbca52332c235b6540ebb4cd2499b6d9d333b3..44a4b45f321e6aa26342731f3fc707407b1b449c 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -17,7 +17,6 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "d_event.h"
-#include "d_net.h"
 #include "g_game.h"
 #include "p_local.h"
 #include "r_main.h"
@@ -4872,10 +4871,6 @@ static void P_SpectatorMovement(player_t *player)
 
 	player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
 
-	ticruned++;
-	if (!(cmd->angleturn & TICCMD_RECEIVED))
-		ticmiss++;
-
 	if (player->mo->z > player->mo->ceilingz - player->mo->height)
 		player->mo->z = player->mo->ceilingz - player->mo->height;
 	if (player->mo->z < player->mo->floorz)
@@ -6471,10 +6466,6 @@ static void P_MovePlayer(player_t *player)
 		if (!player->climbing && (!P_AnalogMove(player)))
 			player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
 
-		ticruned++;
-		if ((cmd->angleturn & TICCMD_RECEIVED) == 0)
-			ticmiss++;
-
 		P_3dMovement(player);
 	}
 
@@ -8932,10 +8923,6 @@ void P_PlayerThink(player_t *player)
 			if (!P_AnalogMove(player))
 				player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
 
-			ticruned++;
-			if ((cmd->angleturn & TICCMD_RECEIVED) == 0)
-				ticmiss++;
-
 			P_DoRopeHang(player);
 			P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
 			P_DoJumpStuff(player, &player->cmd);
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index db873765b3a15e9943b88a2133272313bfbecd0a..e1e8656990efb927879fdf571e63675d17f3a6e3 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -241,7 +241,6 @@ static char returnWadPath[256];
 #include "../i_sound.h"
 #include "../i_system.h"
 #include "../screen.h" //vid.WndParent
-#include "../d_net.h"
 #include "../g_game.h"
 #include "../filesrch.h"
 #include "endtxt.h"
diff --git a/src/y_inter.c b/src/y_inter.c
index 2f2edf7ca71eef368671f501c88db3e745f52959..0d2b28e52eb83212246e02879aba35739968f752 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -15,7 +15,6 @@
 #include "f_finale.h"
 #include "g_game.h"
 #include "hu_stuff.h"
-#include "i_net.h"
 #include "i_video.h"
 #include "p_tick.h"
 #include "r_defs.h"