Remove new fields from isPart, hasPart