Remove default sort for performance reasons.
Remove unneeded test.