Removed redundant generic type specifications as per Java 7 upgrade