Update toolkit version
Eliminate unsued variables and avoid mized declaration/code to avoid warnings