Cleanup the cumulative AE code