Update doc tools
Remove unused rst
Merged