Clean up unused code

Change-Id: I23055446d5da1bdac75ebeb6e876b44959435256