Add thrift, remove unused gems