Clean donor and deferral controllers (#209)