Remove unused code

Change-Id: Ia0770853b378dd209402f030fe2380ba44a1578f