Tox cleanups