Switch to simplified boot/cleanup step API