Remove some pointless type params