[CLEANUP] clean up some DocComments that did not match