am f300f82c: am f40f956e: am b52c9ba1: am 11a57d16: Remove some debug code

* commit 'f300f82cf87d2d5af644f8c9dc0ddf5cb417babb':
  Remove some debug code