===> Cleaning for vault-1.5.3