Cleanup, additional location resiliency