Merge "Reduced Warnings by adding Type Arguments and removing unused imports"