diff --git a/src/services/grpc/account/v2/exchange-token-for-user-data.ts b/src/services/grpc/account/v2/exchange-token-for-user-data.ts
index 19d93e4..81e92f2 100644
--- a/src/services/grpc/account/v2/exchange-token-for-user-data.ts
+++ b/src/services/grpc/account/v2/exchange-token-for-user-data.ts
@@ -2,11 +2,9 @@ import { Status, ServerError } from 'nice-grpc';
 import { getPNIDByAPIAccessToken } from '@/database';
 import { PNID_PERMISSION_FLAGS } from '@/types/common/permission-flags';
 import { config } from '@/config-manager';
-import { Device } from '@/models/device';
-import type { GetUserDataResponse } from '@pretendonetwork/grpc/account/v2/get_user_data_rpc';
-import type { ExchangeTokenForUserDataRequest } from '@pretendonetwork/grpc/account/v2/exchange_token_for_user_data';
+import type { ExchangeTokenForUserDataRequest, ExchangeTokenForUserDataResponse } from '@pretendonetwork/grpc/account/v2/exchange_token_for_user_data_rpc';
 
-export async function exchangeTokenForUserData(request: ExchangeTokenForUserDataRequest): Promise<GetUserDataResponse> {
+export async function exchangeTokenForUserData(request: ExchangeTokenForUserDataRequest): Promise<ExchangeTokenForUserDataResponse> {
 	if (!request.token.trim()) {
 		throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid token');
 	}
@@ -17,18 +15,6 @@ export async function exchangeTokenForUserData(request: ExchangeTokenForUserData
 		throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid token');
 	}
 
-	const devices = (await Device.find({
-		linked_pids: pnid.pid
-	})).map((device) => {
-		return {
-			model: device.get('model'), // ".model" gives the Mongoose model...
-			serial: device.serial,
-			linkedPids: device.linked_pids,
-			accessLevel: device.access_level,
-			serverAccessLevel: device.server_access_level
-		};
-	});
-
 	return {
 		deleted: pnid.deleted || pnid.marked_for_deletion,
 		pid: pnid.pid,
@@ -70,7 +56,6 @@ export async function exchangeTokenForUserData(request: ExchangeTokenForUserData
 			updateBossFiles: pnid.hasPermission(PNID_PERMISSION_FLAGS.UPDATE_BOSS_FILES),
 			deleteBossFiles: pnid.hasPermission(PNID_PERMISSION_FLAGS.DELETE_BOSS_FILES),
 			updatePnidPermissions: pnid.hasPermission(PNID_PERMISSION_FLAGS.UPDATE_PNID_PERMISSIONS)
-		},
-		linkedDevices: devices
+		}
 	};
 }
diff --git a/src/services/grpc/account/v2/update-pnid-permissions.ts b/src/services/grpc/account/v2/update-pnid-permissions.ts
index 075d812..5ca73e6 100644
--- a/src/services/grpc/account/v2/update-pnid-permissions.ts
+++ b/src/services/grpc/account/v2/update-pnid-permissions.ts
@@ -1,7 +1,7 @@
 import { Status, ServerError } from 'nice-grpc';
 import { getPNIDByPID } from '@/database';
 import { PNID_PERMISSION_FLAGS } from '@/types/common/permission-flags';
-import type { UpdatePNIDPermissionsRequest } from '@pretendonetwork/grpc/account/v2/update_pnid_permissions';
+import type { UpdatePNIDPermissionsRequest } from '@pretendonetwork/grpc/account/v2/update_pnid_permissions_rpc';
 import type { Empty } from '@pretendonetwork/grpc/google/protobuf/empty';
 
 export async function updatePNIDPermissions(request: UpdatePNIDPermissionsRequest): Promise<Empty> {