[DF-533] Few fixes with remove nodes