restore removeStructs in struct field polymorphism check