fix switch back to edit mode, remove old serialization code