Remove unreachable code

code cleanup

Change-Id: Iab52371e259197e9f3fc3e1f843293a630f46459
Merge "Remove unreachable code"