[DF-3992] Removed flags for Entity