remove extra queries