removing bloated entity and adding in entity system