Documentation cleanup

Change-Id: Icd9a5fa50be85beafaaecb0fc1b858385ae748bb