added removeComponent(), removed old code
Iterate on cloned containers to avoid concurrent modifications