Minor old unused stuff cleanup.