Finished cleaning up the aggregate service code.