Entity property cleanup.

Long term want to have only a single set of entity properties per entity
in the scene, so need to remove the tag field to work towards this.