Fixed set functions to erase removed items

Commented public functions