Fix Remove() functions