Protocol improvements specific code removed.