Removed InternalEvent, simplified SecurityContext