Clean up Bootstrap implementation