Cleaning up bootstrap