Removed EventQuery