Removed more now-pointless pickle code.