Requirements cleaning; fix for tox ini & setup