Get rid of redundant check