Remove naive sort