remove un-needed code from merge

Change-Id: I109add298f75babc7e0c05e89566182e3f680fbb