Protocol cleanup