Remove last wfDie()s from maintenance