Issue #50: added remove() code to driver, and stubs