Bugfixing

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>
Deregistration of listeners added

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>