Remove legacy node references

Removed legacy node references to stop old node definitions from
polluting the global namespace.