Removed unused modules, updated tox.ini