Remove protocol improvements specific code.