minor cleanup of debug code