API for bootstrap and more cleanup