Remove more unused code

Change-Id: If5b84b904ca117b27dabdac87cb43682cf21b178
3 files changed