Remove fittest query and made it smaller