Remove hardcoded reference to sort implementation