remove extra conditon