Time to remove some old APIs!

Change-Id: I73ca23b0d5c7971a00dfa05357f9b630d9b6ebc8
6 files changed