Further dedupe

Change-Id: I4871e71b7633f143a46554e51ed6f270f343f77a