remove more serializaiton code