More docs clean-up

Change-Id: I6797c8fbe553649b718c2bda91ca9e28e7fdcdfc