Remove some unused type system extensions