Removed dead code identified by -Wunused-function

Change-Id: I085b3ee92254a877110bb0b12adee2ead78a2882
Merge topic 'dead-code-removal' into master

05c33b7d Removed dead code identified by -Wunused-function