more ordinal cleanup