Added emergency clean up logic