Remove debug code

Change-Id: I53236e23990e996b86944214b45a9af014b296f6
6 files changed