Clean up dockable components handling