aggregate task code clean up