remove sorting logic since it is breaking.