Version negotiation rewrite cleanup