[entity] removed final modifiers