Remove Component
Merge branch 'master'