Add remove method and unit tests