Gaming is for having fun. Fun requires clear rules.
Im a bit slow on the uptake and had this same question. So to be completely clear, I need to throw out ("keep as backup")the 7 roles without the buffalo in the corner. Then mix everything that is left together in their appropriate piles(assuming I want to play with all the expansions)?