Updated component removal