Clean up more remnants of dev_boot