Remove unused functions am: d9cd701d66 am: b0ac9e3807 am: 53f921e1fb
am: 0f9fa5a638

Change-Id: I5e31ef023544b8f413c1feee7a0471cdeb6c8140