Cleanup agg

Change-Id: Ia98b52cf792c8dc2bc21014a0a664d99df4d6f7d
20 files changed