Cherry picking Nathan's change to the dev branch.
Remove unused variables and otherwise dead code.

Change-Id: I31cffff06762601553ec36094d0555b809b6eff3
Signed-off-by: Nathan Bass <sblood86@gmail.com>
(cherry picked from commit 802d0ea7409742d59c5902aff1f123f595b0310c)
Merge "Cherry picking Nathan's change to the dev branch. Remove unused variables and otherwise dead code." into cm-11.0-dev