Removed obsolete Protocol v1 code