Added an ability to remove components