Removed old aggregate implementation