Remove component bug fixed