Remove links and ids using Grizzly

Change-Id: I39c82cdca12f5b496c1903a18e93e7e4f95f20be
Merge "Remove links and ids using Grizzly"