Removed unused vars.

Removed redundant declaratons.

Some Lint fixes.

This is the last pr until you can debug the app on android 4.4.