Added remove method and destructor