Now we DO get rid of v1_boot