Also remove declarations for debug function that don't exist (have been
removed (misguidedly?) as unused perhaps).

Change-Id: I0bc3320c52b3d50dc851a07fdc30b593cc4856b1