
        Clean up serialization and other hacks

57f563d