Update to latest Project-TOX core
Remove unnecessary code