BUG: Remove sort order field