updated safe removal and location