Clean new tribe

- Clean some old code