Clean up generics