removed __xxx__ from tool_state parameters