Remove verbose headers and fix minor comment

Change-Id: Ieb914d38df13931fa262b4c3d5853317663a2fb0