Bootstrap cleanup