Remove dependency on each-component