Remove aggregated code (move to post processing)