Kill some graphite vestiges.

Change-Id: Iacfff3388439bb0a9f273ce3f8a53d20267e2c19