finshed remove logic started on update functionality