Remove materialized CTE from daily and montly aggregation