remove un-needed lines of code from merge

Change-Id: I8617e969ab30a9426b03ffca8764f087995b08bf