diff --git a/src/nitro/communication/NitroMessages.ts b/src/nitro/communication/NitroMessages.ts
index efe3073f..3d17724f 100644
--- a/src/nitro/communication/NitroMessages.ts
+++ b/src/nitro/communication/NitroMessages.ts
@@ -59,7 +59,6 @@ import { GroupConfirmMemberRemoveEvent } from './messages/incoming/group/GroupCo
 import { GroupInformationEvent } from './messages/incoming/group/GroupInformationEvent';
 import { GroupMembersEvent } from './messages/incoming/group/GroupMembersEvent';
 import { GroupSettingsEvent } from './messages/incoming/group/GroupSettingsEvent';
-import { AuthenticationEvent } from './messages/incoming/handshake/AuthenticationEvent';
 import { CallForHelpResultMessageEvent } from './messages/incoming/help/CallForHelpResultMessageEvent';
 import { IncomingHeader } from './messages/incoming/IncomingHeader';
 import { AchievementEvent } from './messages/incoming/inventory/achievements/AchievementEvent';
@@ -474,9 +473,6 @@ export class NitroMessages implements IMessageConfiguration
 
     private registerEvents(): void
     {
-        // AUTHENTICATION
-        this._events.set(IncomingHeader.AUTHENTICATION, AuthenticationEvent);
-
         // AVAILABILITY
         this._events.set(IncomingHeader.AVAILABILITY_STATUS, AvailabilityStatusMessageEvent);
         this._events.set(IncomingHeader.GENERIC_ERROR, GenericErrorEvent);
diff --git a/src/nitro/communication/messages/incoming/handshake/AuthenticationEvent.ts b/src/nitro/communication/messages/incoming/handshake/AuthenticationEvent.ts
deleted file mode 100644
index 9583e58e..00000000
--- a/src/nitro/communication/messages/incoming/handshake/AuthenticationEvent.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
-import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
-import { AuthenticationParser } from '../../parser/handshake/AuthenticationParser';
-
-export class AuthenticationEvent extends MessageEvent implements IMessageEvent
-{
-    constructor(callBack: Function)
-    {
-        super(callBack, AuthenticationParser);
-    }
-
-    public getParser(): AuthenticationParser
-    {
-        return this.parser as AuthenticationParser;
-    }
-}
diff --git a/src/nitro/communication/messages/incoming/handshake/index.ts b/src/nitro/communication/messages/incoming/handshake/index.ts
deleted file mode 100644
index e05b5b36..00000000
--- a/src/nitro/communication/messages/incoming/handshake/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './AuthenticationEvent';
diff --git a/src/nitro/communication/messages/incoming/index.ts b/src/nitro/communication/messages/incoming/index.ts
index 5f682b50..997f29e8 100644
--- a/src/nitro/communication/messages/incoming/index.ts
+++ b/src/nitro/communication/messages/incoming/index.ts
@@ -9,7 +9,6 @@ export * from './friendlist';
 export * from './game';
 export * from './generic';
 export * from './group';
-export * from './handshake';
 export * from './help';
 export * from './IncomingHeader';
 export * from './inventory';