Deprecate unused APIs

Change-Id: I0107e246b632dda96b8b025217936954f1f46283
7 files changed