Bug fix for previous merge, removes unnecessary SuppressWarnings for java 6