get rid of redundant conditional