removed components; cleaned code