Cleanup, try to fix recovery non boot (part 2)