Remove unused ENTITIES

Remove all ENTITY declarations that are not used in a file.

Change-Id: I9b53b53754b303b5b001a95b44e57493bb90b222
Merge "Remove unused ENTITIES"