Remove commented-out debug code

Change-Id: I1442d57eb2f80d98370549659eece5a2cd7db3c5