Rem unused method

Change-Id: I7c04f1c8a2e07f2b1e260d859353ad443f88cd2a
Merge "Rem unused method"