===> Cleaning for vault-0.9.0