Small change in activity aggregator and cleanup