Merge "Delete unreferenced legacy code."