Removing server agg logic for now