fixes warnings unreachable code, unused variables

Change-Id: Id84c5233ffd9709272216937be5cfd9b7b118a4a
5 files changed