Reduced warnings by removing unused imports, unused variables and adding type arguments

Change-Id: I551403a94de87a2fdf24ac0175ce69b4c8a48d54
17 files changed