Revert "Major update on overlap-yields, ue-nompi under dev, add inclusiv...

Reverts htautau/hhana#28
Those categories are needed to get the overlap between categories in mva and cba.