Remove conditionals for registering server_start and server_end. Not needed since the code itself is conditional on client version.
Rename branch
