add missing unregister calls

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>