remove some hardcoded type fields