Fix warnings about ClassParameter generics.
Remove some unused classes.