
        Clean up serialization and other hacks

4c90204