Removed unnecessary upcoming events iterations (XYZ event).