Fix DCAE cleanup process