rank order now reflects MDES, cleaned up models #3291