Remove unused code

Change-Id: I0b4df9935540a40a45745eb2ee411fd0db4e4d97