Remove unneded code

Change-Id: Ifd85040728ced6e92a2f72d03e134836dd975c18