remove distinction between sfa aggregate and geni_aggregate