A little cleanup of debug code