Add remove operations, more locking cleanup, comments
Add evict/2 and teardown/1