Remove dead store
Remove unused variable
Merge branch 'master' of https://github.com/tux3/toxcore