Remove dead code

Accidentally left in dabbbc7d2a88ceb9efce5742af05e848dbcaa66e

Change-Id: I58e65ca7ad23d00992f66f3bcee879e662b62ef0
Merge "Remove dead code"