clean up debug output

Change-Id: I0a9aa1b38d079f39963bb822de2894500512bc4b