Remove
Fix to test-verbose
Update doc, in review