Remove accidental inclusion of debug code

Change-Id: Ic21a0e166e15140f0f4c15446c13cc3531e7ae18