Listeners are now removed correctly in ComponentHandlerSystem