Cleanup comments

Change-Id: Ie2429f803adf3f3874986c74a4ae3fe0b65df7c3