Remote storage delete policy and replacement flow fix