Renamed m_Id2BaseObject to m_IdToBaseEntity
For statement optimizations
No need to check if a pointer is null before deleting it