Correct version metadata
Remove unnecessary singleton marshaller and unmarshaller
Update upgrading docs