Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables

Change-Id: I39a4eb2b17f3411b17fcc49cbbbe396e89fab24a
24 files changed