cleanup in DuelCtrl and test