removed unnecessary components/classes