removed references to entity in components, no need for it