better handling of Channel/Port/Component/Binding removal