remove old debugging stuff

Change-Id: I7882cf55a99d11d256e3c241b536644b3f2978f0
Merge "remove old debugging stuff"