[FOLLOWUP][TASK] Cleanup bootstrap