Removed useless sorting