daca2: improved cleanup