More generics cleanup