More bootstrap cleanup