diff --git a/ee/rpc/cdvd/src/internal.h b/ee/rpc/cdvd/src/internal.h
index 4d1a2c7f3657..cdc13803e9e1 100644
--- a/ee/rpc/cdvd/src/internal.h
+++ b/ee/rpc/cdvd/src/internal.h
@@ -26,9 +26,6 @@ extern int CdDebug;
 extern volatile int CdCallbackNum;
 extern volatile int cbSema;
 
-extern int CdThreadId;
-extern ee_thread_status_t CdThreadParam;
-
 extern int nCmdSemaId;
 extern int sCmdSemaId;
 
diff --git a/ee/rpc/cdvd/src/libcdvd.c b/ee/rpc/cdvd/src/libcdvd.c
index cf4bff79c9b4..1f77eb213622 100644
--- a/ee/rpc/cdvd/src/libcdvd.c
+++ b/ee/rpc/cdvd/src/libcdvd.c
@@ -88,22 +88,18 @@ volatile int CdCallbackNum;
 volatile sceCdCBFunc sceCdCallbackFunc;
 
 // threads
-int CdThreadId = 0;
-ee_thread_status_t CdThreadParam;
 int callbackThreadId = 0;
 ee_thread_t callbackThreadParam;
 
 // current command variables
 
 s32 diskReadyMode __attribute__((aligned(64)));
-s32 trayReqData __attribute__((aligned(64)));
 u32 initMode __attribute__((aligned(64)));
 
 // init stuff
 CdInitPkt cdInitRecvBuff __attribute__((aligned(64)));
 // searchfile stuff
 SearchFilePkt searchFileSendBuff __attribute__((aligned(64)));
-u32 searchFileRecvBuff __attribute__((aligned(64)));
 #endif
 
 // Prototypes for multimodule
@@ -117,16 +113,12 @@ extern int callbackSemaId;
 extern volatile int cbSema;
 extern volatile int CdCallbackNum;
 extern volatile sceCdCBFunc sceCdCallbackFunc;
-extern int CdThreadId;
-extern ee_thread_status_t CdThreadParam;
 extern int callbackThreadId;
 extern ee_thread_t callbackThreadParam;
 extern s32 diskReadyMode;
-extern s32 trayReqData;
 extern u32 initMode;
 extern CdInitPkt cdInitRecvBuff;
 extern SearchFilePkt searchFileSendBuff;
-extern u32 searchFileRecvBuff;
 
 /* Other Functions */
 
@@ -136,7 +128,6 @@ s32 sceCdInit(s32 mode)
     if (_CdSyncS(1))
         return 0;
     sceSifInitRpc(0);
-    CdThreadId     = GetThreadId();
     memset(&clientInit, 0, sizeof(clientInit));
 
     while (1) {
@@ -193,7 +184,6 @@ s32 sceCdSearchFile(sceCdlFILE *file, const char *name)
     if (PollSema(nCmdSemaId) != nCmdSemaId)
         return 0;
     nCmdNum = CD_SERVER_SEARCHFILE;
-    ReferThreadStatus(CdThreadId, &CdThreadParam);
     if (sceCdSync(1)) {
         SignalSema(nCmdSemaId);
         return 0;
@@ -337,8 +327,6 @@ s32 sceCdInitEeCB(s32 priority, void *stackAddr, s32 stackSize)
         return 0;
     }
     // initialise callback thread
-    CdThreadId = GetThreadId();
-    ReferThreadStatus(CdThreadId, &CdThreadParam);
     callbackThreadParam.stack_size       = stackSize;
     callbackThreadParam.gp_reg           = &_gp;
     callbackThreadParam.func             = &_CdCallbackLoop;
diff --git a/ee/rpc/cdvd/src/ncmd.c b/ee/rpc/cdvd/src/ncmd.c
index 8c667683c8c8..38f7454e90d2 100644
--- a/ee/rpc/cdvd/src/ncmd.c
+++ b/ee/rpc/cdvd/src/ncmd.c
@@ -103,7 +103,6 @@ u32 cdda_st_buf[64 / sizeof(u32)] ALIGNED(64);
 #endif
 
 extern int initVersionCdvdfsv;
-extern int bindNcmd;
 extern SifRpcClientData_t clientNCmd;
 extern int nCmdSemaId;
 extern int nCmdNum;
@@ -807,7 +806,6 @@ int _CdCheckNCmd(int cmd)
     }
 
     nCmdNum = cmd;
-    ReferThreadStatus(CdThreadId, &CdThreadParam);
     if (sceCdSync(1)) {
         SignalSema(nCmdSemaId);
         return 0;
diff --git a/ee/rpc/cdvd/src/scmd.c b/ee/rpc/cdvd/src/scmd.c
index e7b538460db5..f73925fb524d 100644
--- a/ee/rpc/cdvd/src/scmd.c
+++ b/ee/rpc/cdvd/src/scmd.c
@@ -459,7 +459,6 @@ int _CdCheckSCmd(int cur_cmd)
         return 0;
     }
     sCmdNum = cur_cmd;
-    ReferThreadStatus(CdThreadId, &CdThreadParam);
     if (_CdSyncS(1)) {
         SignalSema(sCmdSemaId);
         return 0;
diff --git a/iop/cdvd/cdvdfsv/src/cdvdfsv.c b/iop/cdvd/cdvdfsv/src/cdvdfsv.c
index 808e2505fbf4..9f95a20a72d5 100644
--- a/iop/cdvd/cdvdfsv/src/cdvdfsv.c
+++ b/iop/cdvd/cdvdfsv/src/cdvdfsv.c
@@ -314,13 +314,11 @@ static void cdvdfsv_parseargs(int ac, char **av)
 
 int sceCdChangeThreadPriority(int priority)
 {
-	iop_thread_info_t thinfo;
-
 	if ( (unsigned int)(priority - 9) >= 0x73 )
 		return -403;
 	if ( priority == 9 )
 		priority = 10;
-	ReferThreadStatus(0, &thinfo);
+	// Unofficial: remove unused ReferThreadStatus
 	ChangeThreadPriority(0, 8);
 	ChangeThreadPriority(g_cdvdfsv_thids[0], priority - 1);
 	ChangeThreadPriority(g_cdvdfsv_thids[2], priority);
diff --git a/iop/cdvd/cdvdfsv/src/imports.lst b/iop/cdvd/cdvdfsv/src/imports.lst
index 369b5e4af825..d0100a2778fd 100644
--- a/iop/cdvd/cdvdfsv/src/imports.lst
+++ b/iop/cdvd/cdvdfsv/src/imports.lst
@@ -36,7 +36,6 @@ I_ExitDeleteThread
 I_TerminateThread
 I_ChangeThreadPriority
 I_GetThreadId
-I_ReferThreadStatus
 I_DelayThread
 I_SetAlarm
 I_CancelAlarm
diff --git a/iop/input/padman/src/freepad.c b/iop/input/padman/src/freepad.c
index e5080d820e53..dc185bb051df 100644
--- a/iop/input/padman/src/freepad.c
+++ b/iop/input/padman/src/freepad.c
@@ -141,10 +141,8 @@ void WaitClearEvent(int eventflag, u32 bits, int mode, u32 *resbits_out)
 	WaitEventFlag(eventflag, bits | EF_EXIT_THREAD, WEF_OR, &resbits);
 
 	if( resbits & EF_EXIT_THREAD )
-	{	//Yes, it's unused. Probably leftover code.
-		iop_thread_info_t tinfo;
-
-		ReferThreadStatus(TH_SELF, &tinfo);
+	{
+		// Unofficial: remove unused ReferThreadStatus
 		SetEventFlag(eventflag, EF_EXIT_THREAD);
 		ExitThread();
 	}