Remove complex SubEvent ordering, it was breaking