Removing some unused code path

Change-Id: I16a651d77c6557b33f8389407a222f058a8168d4
5 files changed