Update ref to Entity and remove ref that has not existed for years

Change-Id: Ibf7edc0233e19e6b9dbdaf80279437060b06a7d6
Merge "Update ref to Entity and remove ref that has not existed for years"