cleanup the backport from CMA code