Ned/fix noisy docs

Review please?  @auraz @jtauber