removed unnecessary SuppressWarning unchecked
removed masking SuppressWarning rawtypes