Simplify code for remove; add docstrings
Update README