ComponentHandler are now removed correctly