Changes to entity for optimization

There is alot of neadless code happening within the entity that I
removed.