Cleanups for some debugging code