rm of some unreachable code

Change-Id: I87a03e5a9dbafc5aa02a33f475afd0f10d5568af