Remove un needed code to fix build error

Change-Id: Ic58e3cf245865a756c843eb79a07c3808f4ded6e