Remove swap_node compatability code