more protocol handler cleanup.