Clean up Mpzl10n API in FTU #1058985