Hygiene
Fix aggregators
Hygiene - remove protobuf