Remove unused variables and otherwise dead code.

Change-Id: I31cffff06762601553ec36094d0555b809b6eff3
Signed-off-by: Nathan Bass <sblood86@gmail.com>