Remove some test code, improve comment.

Change-Id: Ifd4e7eee8ec831f8822c43de1df9e029ccb41ceb