Serialization issues fixed. Old code removed.