Merging changes related to removing nodes, general project restructuring