2.06.3:minrog:2 Validator #171 events/decisions

Removing redundant AND and OR statements