Clean up debug code

Change-Id: I8e445c3b9f52f6882f17ae46536c92617cf3150e