Make `remove` lazy

Fixes #77