diff --git a/src/events/guildBanRemove.ts b/src/events/guildBanRemove.ts
index bcb70d5..3be4560 100644
--- a/src/events/guildBanRemove.ts
+++ b/src/events/guildBanRemove.ts
@@ -1,14 +1,13 @@
 import type { GuildAuditLogsEntry, GuildBan, User } from "discord.js";
 import { AuditLogEvent } from "discord.js";
-import { purgeByUser } from "../actions/tickets/delete.js";
 import type { NucleusClient } from "../utils/client.js";
 
 export const event = "guildBanRemove";
 
 export async function callback(client: NucleusClient, ban: GuildBan) {
-    purgeByUser(ban.user.id, ban.guild.id);
-    const { log, NucleusColors, entry, renderUser, renderDelta, getAuditLog } = client.logger;
-    const auditLog = (await getAuditLog(ban.guild, AuditLogEvent.EmojiCreate))
+    const { log, isLogging, NucleusColors, entry, renderUser, renderDelta, getAuditLog } = client.logger;
+    if (!await isLogging(ban.guild.id, "guildMemberPunish")) return;
+    const auditLog = (await getAuditLog(ban.guild, AuditLogEvent.MemberBanRemove))
         .filter((entry: GuildAuditLogsEntry) => ((entry.target! as User).id === ban.user.id))[0];
     if (!auditLog) return;
     if (auditLog.executor!.id === client.user!.id) return;
@@ -20,12 +19,12 @@
             calculateType: "guildMemberPunish",
             color: NucleusColors.green,
             emoji: "PUNISH.BAN.GREEN",
-            timestamp: new Date().getTime()
+            timestamp: Date.now()
         },
         list: {
             memberId: entry(ban.user.id, `\`${ban.user.id}\``),
             name: entry(ban.user.id, renderUser(ban.user)),
-            unbanned: entry(new Date().getTime(), renderDelta(new Date().getTime())),
+            unbanned: entry(Date.now(), renderDelta(Date.now())),
             unbannedBy: entry(auditLog.executor!.id, renderUser(auditLog.executor!)),
             accountCreated: entry(ban.user.createdTimestamp, renderDelta(ban.user.createdTimestamp))
         },
