Remove an unneeded function and an unused callback function

Change-Id: Icb01f50ad12d19a019da04bc27fa0d6f6ec04dfe
3 files changed