removed thrift stuff