Cleanup, resiliency