[DF-185] Fixed order during component remove process