Removed group sorting