Removed old NodeSwap Stuff