WIP: remove custom sort