remove redundant query