update to and from document (and remove deprecated classes)