Clean up aggregator implementation
Clean up aggregator implementation

fgbreel/jetpants,tumblr/jetpants,tumblr/jetpants,yonglehou/jetpants,tumblr/jetpants,dallasmarlow/jetpants,tumblr/jetpants,dallasmarlow/jetpants,fgbreel/jetpants,yonglehou/jetpants