Clean up

o Support for global scans
o Remove merger support from UniqueNodeFactory
o Various glitches