Started a cleanup of bootstrap