removed redundant query