Remove debug code

Change-Id: I6e5c87009d647f20c2fddd9b38162523a19ded1e