Clean up all generics warnings