remove old debugging stuff

Change-Id: I75ed7f8e35c6a510c2292445e6a3811789a901d2