[#42401717 #42401673] Drop unexpired_term field and remove admin references