Cleanup GenTypeClass

`First` and `Codiagonal` were removed
8b9fb88bb993fcaa4
d16951102115966af