Clean up the generics