remove serialization support and clean up