Fix references to some old code

Change-Id: Ifae2d5a5837207f7cb7366ab0c8ec7fc2477982e