Remove Generics
And fixes