Remove usage of soon to be removed FieldType