Remove direct dependency on AuditEvent — #12