Remove explicit sort