cleanup some comments

Change-Id: I6440c939802f4a0a291b3579071800fc91353e62