Removed calls to get_context_instance