diff --git a/api/src/core/index.ts b/api/src/core/index.ts
index 179205656..89f58419f 100644
--- a/api/src/core/index.ts
+++ b/api/src/core/index.ts
@@ -1,7 +1,6 @@
 export * as modules from '@app/core/modules';
 export * as notifiers from '@app/core/notifiers';
 export * as utils from '@app/core/utils';
-export * from '@app/core/bus';
 export * from '@app/core/log';
 export * from '@app/core/permission-manager';
 export * from '@app/core/permissions';
diff --git a/api/src/core/modules/add-user.ts b/api/src/core/modules/add-user.ts
index 7a506c96b..5effedb93 100644
--- a/api/src/core/modules/add-user.ts
+++ b/api/src/core/modules/add-user.ts
@@ -1,11 +1,11 @@
 import type { CoreContext, CoreResult } from '@app/core/types';
-import { bus } from '@app/core/bus';
 import { AppError } from '@app/core/errors/app-error';
 import { ensurePermission } from '@app/core/utils/permissions/ensure-permission';
 import { hasFields } from '@app/core/utils/validation/has-fields';
 import { FieldMissingError } from '@app/core/errors/field-missing-error';
 import { emcmd } from '@app/core/utils/clients/emcmd';
 import { getters } from '@app/store';
+import { pubsub } from '@app/core/pubsub';
 
 interface Context extends CoreContext {
 	readonly data: {
@@ -61,7 +61,7 @@ export const addUser = async (context: Context): Promise<CoreResult> => {
 	}
 
 	// Update users channel with new user
-	bus.emit('users', {
+	pubsub.publish('users', {
 		users: {
 			mutation: 'CREATED',
 			node: [user],
@@ -69,7 +69,7 @@ export const addUser = async (context: Context): Promise<CoreResult> => {
 	});
 
 	// Update user channel with new user
-	bus.emit('user', {
+	pubsub.publish('user', {
 		user: {
 			mutation: 'CREATED',
 			node: user,
diff --git a/api/src/core/utils/index.ts b/api/src/core/utils/index.ts
index 23ea6b7b9..456fe2c9e 100644
--- a/api/src/core/utils/index.ts
+++ b/api/src/core/utils/index.ts
@@ -1,7 +1,6 @@
 // Created from 'create-ts-index'
 
 export * from './array';
-export * from './authentication';
 export * from './clients';
 export * from './plugins';
 export * from './shares';