Add generic paramters to Collection declarations
Remove unneeded @SuppressWarnings("unchecked") tags
Remove unused imports