More cleanups for mpl_v2