Remove unneeded serialization