More code cleaning

- remove some dead code
- better variable naming
- add debug log for exception
- clean some unused imports

Change-Id: Iec4239a7e75f29d860f286ab089e748e8a672281
3 files changed