More comment/debug cleanup.

Change-Id: I323dab8d14259c1b73043a5a67dab13954c025b8