removed unnecessary components