Update xcondition to new options & cleanup