Remove ModeListenerContainer and using osgi registry