Fix not setting tox null after cleanup
also reordered functions for super extra safety