Improved generics that were useless and causes compiler errors on Java 1.6