Remove TypeType and use Ty