removed extra components