Add DisableSwapTypes policy with usage and remove unused ExtraFields policy