Remove ordering unused on 3.0+