Remove some unused code

Change-Id: I5af4c4e7d8207ebc5418e9f9f3339554146836be
1 file changed