Builder: Update dstore listeners from remove to delete