diff --git a/src/middleware/authentication.ts b/src/middleware/authentication.ts
deleted file mode 100644
index f98b11e..0000000
--- a/src/middleware/authentication.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import express from 'express';
-import { getNEXDataByPID } from '@/util';
-
-export default async function authenticationMiddleware(request: express.Request, response: express.Response, next: express.NextFunction): Promise<void> {
-	if (request.pid) {
-		// TODO - Get users PNIDs
-		request.nexAccount = await getNEXDataByPID(request.pid);
-	}
-
-	return next();
-}
diff --git a/src/server.ts b/src/server.ts
index f4c1d47..8b01e06 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -10,10 +10,7 @@ import { startGRPCServer } from '@/services/grpc/server';
 import RequestException from '@/request-exception';
 import { LOG_INFO, LOG_SUCCESS } from '@/logger';
 import { config } from '@/config-manager';
-
 import parseUserAgentMiddleware from '@/middleware/parse-user-agent';
-import authenticationMiddleware from '@/middleware/authentication';
-
 import nppl from '@/services/nppl';
 import npts from '@/services/npts';
 import npdi from '@/services/npdi';
@@ -31,7 +28,6 @@ app.use(express.urlencoded({
 }));
 
 app.use(parseUserAgentMiddleware);
-app.use(authenticationMiddleware);
 
 app.use(nppl);
 app.use(npts);
diff --git a/src/services/spr.ts b/src/services/spr.ts
index 1165787..bcdd85c 100644
--- a/src/services/spr.ts
+++ b/src/services/spr.ts
@@ -69,13 +69,19 @@ spr.post('/relay/0', multipartParser, async (request, response) => {
 		return;
 	}
 
-	if (!request.pid || !request.nexAccount) {
+	if (!request.pid) {
+		response.sendStatus(400);
+		return;
+	}
+
+	const nexAccount = await getNEXDataByPID(request.pid);
+	if (!nexAccount) {
 		response.sendStatus(400);
 		return;
 	}
 
 	// * Check that the account is a 3DS and isn't banned
-	if (!request.nexAccount.friendCode || request.nexAccount.accessLevel < 0) {
+	if (!nexAccount.friendCode || nexAccount.accessLevel < 0) {
 		response.sendStatus(400);
 		return;
 	}
diff --git a/src/types/express.d.ts b/src/types/express.d.ts
index f7d4529..936a4fe 100644
--- a/src/types/express.d.ts
+++ b/src/types/express.d.ts
@@ -1,11 +1,6 @@
-import { GetNEXDataResponse } from '@pretendonetwork/grpc/account/get_nex_data_rpc';
-
-declare global {
-	namespace Express {
-		interface Request {
-			files?: Record<string, any>;
-			pid: number;
-			nexAccount: GetNEXDataResponse | null;
-		}
+declare namespace Express {
+	interface Request {
+		files?: Record<string, any>;
+		pid: number;
 	}
 }