Drop custom logic for Scav_thr and Evac_thr (#497)