Prune vestige from #2917