Remove legacy stuff.

Change-Id: Ica5f4ac481eb2a38d150b773bcdaa2f1610220ae