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