Remove local context references