Removed code for server-side sorting