Add cleanup to bootstrap script