Do not panic in tool doc clean
WIP: refactor/tidy/adapt to submodule changes