components optimization

rm