clean up commented items

Change-Id: I44ecb7d0c9aee35142bddd6b08826e9fdcd5c3b1