FLEX-34285 fix issue with remove