remove usage of wrapper node