remove last vestiges of stafford, long since retired

Change-Id: If07840dba3c2f73046f440d14d7387698c2f90ba