Removed hacks from part_locator_node