Remove some dead thrift code