Minor changes. Remove silly serialisation stuff.