Removed obsolete Protocol v2 code