Temporarily revert base class name
Remove tor modules