simplify remove method
update tests
update readme and history