Removed existing non required components