Delete unused code to fix warnings

Change-Id: Ie4f9d53c5035f19aea16d40a0f2170a7c9b5dd8c
4 files changed