Removing overly-specific protocol versioning