[-] remove unused var
Merge branch 'remove_unused_vars_hotfix'