removed some unused methods

Change-Id: Ie062be71af92e12c7d2d78d2fdff6b261fce7938