Remove unused methods

Change-Id: Ib1fb65981151ef1c0c1cd316790e9906d1072dfc