(PUP-2557) Deprecate and remove node inheritence