Remove legacy node references

Remove legacy node references to stop polluting the global namespace
with old node definitions.