Refactor bundle example, remove link-node helpers