Removing generics parameterization

The generics enter in conflict with private inner-classes and this becomes a problem with some Java compilers.