Cleanup
Removed unneeded dependency
Better cleanup in tournament mode