Added the teardown function pointer to the remove operation

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>