Some old doctests rely on special Scratch object which clean up temporary directory when they're deleted. This is a bit undesirable because deletion is not predictable and the classes aren't used enough to be worthwhile.
* Remove ScratchBranch, ScratchDir, ScratchTransport, etc * Remove old doctests or convert to unittests * Incidental cleanups