strip out anything related to UNIFY_CHANNEL_MEM_HEAP, will be a distinct MR