clean up and update bootstrap