Generics cleanup