diff --git a/package.json b/package.json
index 67c1753..6e10052 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@coral-xyz/anchor": "^0.29.0",
-    "@drift-labs/sdk": "2.65.0-beta.5",
+    "@drift-labs/sdk": "2.65.0-beta.6",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/auto-instrumentations-node": "^0.31.1",
     "@opentelemetry/exporter-prometheus": "^0.31.0",
diff --git a/src/index.ts b/src/index.ts
index 1bc9028..5092dd2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -89,7 +89,7 @@ const commitHash = process.env.COMMIT;
 //@ts-ignore
 const sdkConfig = initialize({ env: process.env.ENV });
 
-const stateCommitment: Commitment = 'processed';
+const stateCommitment: Commitment = 'confirmed';
 const serverPort = process.env.PORT || 6969;
 export const ORDERBOOK_UPDATE_INTERVAL = 1000;
 const WS_FALLBACK_FETCH_INTERVAL = ORDERBOOK_UPDATE_INTERVAL * 10;
diff --git a/src/publishers/dlobPublisher.ts b/src/publishers/dlobPublisher.ts
index 4181a9b..069d5c1 100644
--- a/src/publishers/dlobPublisher.ts
+++ b/src/publishers/dlobPublisher.ts
@@ -42,7 +42,7 @@ import FEATURE_FLAGS from '../utils/featureFlags';
 import { GeyserOrderSubscriber } from '../grpc/OrderSubscriberGRPC';
 
 require('dotenv').config();
-const stateCommitment: Commitment = 'processed';
+const stateCommitment: Commitment = 'confirmed';
 const driftEnv = (process.env.ENV || 'devnet') as DriftEnv;
 const commitHash = process.env.COMMIT;
 const REDIS_HOST = process.env.REDIS_HOST || 'localhost';
diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts
index e25e3d4..2de92c7 100644
--- a/src/publishers/tradesPublisher.ts
+++ b/src/publishers/tradesPublisher.ts
@@ -7,9 +7,7 @@ import {
 	initialize,
 	DriftEnv,
 	SlotSubscriber,
-	UserMap,
 	Wallet,
-	BulkAccountLoader,
 	EventSubscriber,
 	OrderAction,
 	convertToNumber,
@@ -38,9 +36,7 @@ const REDIS_PASSWORD = process.env.REDIS_PASSWORD;
 //@ts-ignore
 const sdkConfig = initialize({ env: process.env.ENV });
 
-const stateCommitment: Commitment = 'processed';
-const ORDERBOOK_UPDATE_INTERVAL = 1000;
-
+const stateCommitment: Commitment = 'confirmed';
 let driftClient: DriftClient;
 
 const opts = program.opts();
@@ -62,19 +58,14 @@ const main = async () => {
 		commitment: stateCommitment,
 	});
 
-	const bulkAccountLoader = new BulkAccountLoader(
-		connection,
-		stateCommitment,
-		ORDERBOOK_UPDATE_INTERVAL
-	);
-
 	driftClient = new DriftClient({
 		connection,
 		wallet,
 		programID: clearingHousePublicKey,
 		accountSubscription: {
-			type: 'polling',
-			accountLoader: bulkAccountLoader,
+			type: 'websocket',
+			commitment: stateCommitment,
+			resubTimeoutMs: 30_000,
 		},
 		env: driftEnv,
 	});
@@ -96,18 +87,6 @@ const main = async () => {
 
 	await slotSubscriber.subscribe();
 
-	const userMap = new UserMap({
-		driftClient,
-		subscriptionConfig: {
-			type: 'websocket',
-			resubTimeoutMs: 30_000,
-			commitment: stateCommitment,
-		},
-		skipInitialLoad: false,
-		includeIdle: false,
-	});
-	await userMap.subscribe();
-
 	const redisClient = new RedisClient(REDIS_HOST, REDIS_PORT, REDIS_PASSWORD);
 	await redisClient.connect();
 
diff --git a/yarn.lock b/yarn.lock
index 8f534dd..b404613 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -115,10 +115,10 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@drift-labs/sdk@2.65.0-beta.5":
-  version "2.65.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.65.0-beta.5.tgz#3980886957cda76e80a8982a4363647711f223bb"
-  integrity sha512-M95F/R4fXNLvL0GkhoDQvfXLe+UpWPgvLWrJNnFR0j6WMS+IyJTykiZSBI0n/EqTI78AnA+nvbV0GVcFfpZnrA==
+"@drift-labs/sdk@2.65.0-beta.6":
+  version "2.65.0-beta.6"
+  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.65.0-beta.6.tgz#7da1434ce04142f4adca573baf44dc3539303a0f"
+  integrity sha512-ENnkk1o1wahXoT3F1svjiHzVdSrxlVZ7NfUXmrtyQEqbcZtbUyoS6CqL9f7aC273ydw7xC0a3jrxEH0yMOrcVQ==
   dependencies:
     "@coral-xyz/anchor" "0.28.1-beta.2"
     "@ellipsis-labs/phoenix-sdk" "^1.4.2"