Revert "Revert "Remove unused methods""

This reverts commit 3ff2325f97dda222d286d0d8ceb720de8b1a537c.

TSC request on 30.11

Change-Id: I67469ab5f9253bbb5ab5db61e45ffd74ca4858eb
8 files changed