Second attempt to remove debug code