Removed components not needed