removed unnecessary nls tags
diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java
index fcbf69c..a6befef 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/spy/VerbosePacketStream.java
@@ -1539,22 +1539,22 @@
 			long typeId= readReferenceTypeID(in);
 			int classfileLength= in.readInt();
 			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); 
-			println(TcpIpSpyMessages.VerbosePacketStream_Classfile_length__101, classfileLength); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_Classfile_length__101, classfileLength);
 			while((classfileLength -= in.skipBytes(classfileLength)) != 0) {
 			}
-			printDescription(TcpIpSpyMessages.VerbosePacketStream_Class_bytes__102); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_skipped_103); //$NON-NLS-1$
+			printDescription(TcpIpSpyMessages.VerbosePacketStream_Class_bytes__102);
+			println(TcpIpSpyMessages.VerbosePacketStream_skipped_103);
 		}
 	}
 	
 	private void printVmSetDefaultStratumCommand(DataInputStream in) throws IOException {
 		String stratumId= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Stratum_id__104, stratumId); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Stratum_id__104, stratumId);
 	}
 	
 	private void printVmAllClassesWithGenericReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int classesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Classes_count__42, classesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Classes_count__42, classesCount);
 		for(int i= 0; i < classesCount; i++) {
 			byte refTypeTag= in.readByte();
 			long typeId= readReferenceTypeID(in);
@@ -1562,26 +1562,26 @@
 			String genericSignature= readString(in);
 			int status= in.readInt();
 			printRefTypeTag(refTypeTag);
-			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Class_signature__41, signature); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Generic_class_signature__405, genericSignature); //$NON-NLS-1$
+			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
+			println(TcpIpSpyMessages.VerbosePacketStream_Class_signature__41, signature);
+			println(TcpIpSpyMessages.VerbosePacketStream_Generic_class_signature__405, genericSignature);
 			printClassStatus(status);
 		}
 	}
 	
 	private void printRtDefaultCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long typeId= readReferenceTypeID(in);
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
 	}
 	
 	private void printRtSignatureReply(DataInputStream in) throws IOException {
 		String signature= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature);
 	}
 	
 	private void printRtClassLoaderReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classLoaderId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_ClassLoader_id__107, classLoaderId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_ClassLoader_id__107, classLoaderId);
 	}
 
 	private void printRtModifiersReply(DataInputStream in) throws IOException {
@@ -1591,30 +1591,30 @@
 
 	private void printRtFieldsReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int fieldsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount);
 		for (int i= 0; i < fieldsCount; i++) {
 			long fieldId= readFieldID(in);
 			String name= readString(in);
 			String signature= readString(in);
 			int modifiers= in.readInt();
-			printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); //$NON-NLS-1$
+			printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
+			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name);
+			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature);
 			printFieldModifiers(modifiers);
 		}
 	}
 	
 	private void printRtMethodsReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int methodsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Methods_count__112, methodsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Methods_count__112, methodsCount);
 		for (int i= 0; i < methodsCount; i++) {
 			long methodId= readMethodID(in);
 			String name= readString(in);
 			String signature= readString(in);
 			int modifiers= in.readInt();
-			printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); //$NON-NLS-1$
+			printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId);
+			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name);
+			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature);
 			printMethodModifiers(modifiers);
 		}
 	}
@@ -1622,35 +1622,35 @@
 	private void printRtGetValuesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long typeId= readReferenceTypeID(in);
 		int fieldsCount= in.readInt();
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount);
 		for (int i= 0; i < fieldsCount; i++) {
 			long fieldId= readFieldID(in);
-			printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
+			printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
 		}
 	}
 
 	private void printRtGetValuesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int valuesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount);
 		for (int i= 0; i < valuesCount; i++) {
-			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in); //$NON-NLS-1$
+			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in);
 		}
 	}
 	
 	private void printRtSourceFileReply(DataInputStream in) throws IOException {
 		String sourceFile= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Source_file__121, sourceFile); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Source_file__121, sourceFile);
 	}
 	
 	private void printRtNestedTypesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int typesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Types_count__99, typesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Types_count__99, typesCount);
 		for (int i= 0; i < typesCount; i++) {
 			byte typeTag= in.readByte();
 			long typeId= readReferenceTypeID(in);
 			printRefTypeTag(typeTag);
-			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
+			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
 		}
 	}
 	
@@ -1661,59 +1661,59 @@
 	
 	private void printRtInterfacesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int interfacesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Interfaces_count__124, interfacesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Interfaces_count__124, interfacesCount);
 		for (int i= 0; i < interfacesCount; i ++) {
 			long interfaceId= readReferenceTypeID(in);
-			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Interface_type_id__125, interfaceId); //$NON-NLS-1$
+			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Interface_type_id__125, interfaceId);
 		}
 	}
 	
 	private void printRtClassObjectReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classObjectId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Class_object_id__126, classObjectId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Class_object_id__126, classObjectId);
 	}
 	
 	private void printRtSourceDebugExtensionReply(DataInputStream in) throws IOException {
 		String extension= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Extension__127, extension); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Extension__127, extension);
 	}
 	
 	private void printRtSignatureWithGenericReply(DataInputStream in) throws IOException {
 		String signature= readString(in);
 		String genericSignature= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Generic_signature__422, genericSignature); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); 
+		println(TcpIpSpyMessages.VerbosePacketStream_Generic_signature__422, genericSignature);
 	}
 	
 	private void printRtFieldsWithGenericReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int fieldsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount);
 		for (int i= 0; i < fieldsCount; i++) {
 			long fieldId= readFieldID(in);
 			String name= readString(in);
 			String signature= readString(in);
 			String genericSignature= readString(in);
 			int modifiers= in.readInt();
-			printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Generic_signature__422, genericSignature); //$NON-NLS-1$
+			printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
+			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name);
+			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature);
+			println(TcpIpSpyMessages.VerbosePacketStream_Generic_signature__422, genericSignature);
 			printFieldModifiers(modifiers);
 		}
 	}
 	
 	private void printRtMethodsWithGenericReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int methodsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Methods_count__112, methodsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Methods_count__112, methodsCount);
 		for (int i= 0; i < methodsCount; i++) {
 			long methodId= readMethodID(in);
 			String name= readString(in);
 			String signature= readString(in);
 			String genericSignature= readString(in);
 			int modifiers= in.readInt();
-			printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature); //$NON-NLS-1$
+			printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId);
+			println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name);
+//			println(TcpIpSpyMessages.VerbosePacketStream_Signature__106, signature);
 			println(TcpIpSpyMessages.VerbosePacketStream_Generic_signature__422, genericSignature); 
 			printMethodModifiers(modifiers);
 		}
@@ -1721,20 +1721,20 @@
 	
 	private void printCtSuperclassCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classTypeId= readReferenceTypeID(in);
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId);
 	}
 	
 	private void printCtSuperclassReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		long superclassTypeId= readReferenceTypeID(in);
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Superclass_type_id__129, superclassTypeId); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Superclass_type_id__129, superclassTypeId);
 	}
 
 	private void printCtSetValuesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classTypeId= readReferenceTypeID(in);
 		int fieldsCount= in.readInt();
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount); //$NON-NLS-1$
-		throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_List_of_values__NOT_MANAGED_132, remainderData(in)); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount);
+		throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_List_of_values__NOT_MANAGED_132, remainderData(in));
 	}
 	
 	private void printCtInvokeMethodCommand(DataInputStream in) throws IOException, UnableToParseDataException {
@@ -1742,22 +1742,22 @@
 		long threadId= readObjectID(in);
 		long methodId= readMethodID(in);
 		int argumentsCount= in.readInt();
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId); //$NON-NLS-1$
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
-		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Arguments_count__136, argumentsCount); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId);
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
+		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Arguments_count__136, argumentsCount);
 		for (int i= 0; i < argumentsCount; i++) {
-			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Argument__137, in); //$NON-NLS-1$
+			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Argument__137, in);
 		}
 		int invocationOptions= in.readInt();
 		printInvocationOptions(invocationOptions);
 	}
 	
 	private void printCtInvokeMethodReply(DataInputStream in) throws IOException, UnableToParseDataException {
-		readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Return_value__138, in); //$NON-NLS-1$
+		readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Return_value__138, in);
 		byte signatureByte= in.readByte();
 		long exception= readObjectID(in);
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exception, signatureByte); //$NON-NLS-1$
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exception, signatureByte);
 	}
 
 	private void printCtNewInstanceCommand(DataInputStream in) throws IOException, UnableToParseDataException {
@@ -1769,83 +1769,83 @@
 		long newObjectId= readObjectID(in);
 		byte exceptionSignatureByte= in.readByte();
 		long exception= readObjectID(in);
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_New_object_id__140, newObjectId, objectSignatureByte); //$NON-NLS-1$
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exception, exceptionSignatureByte); //$NON-NLS-1$
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_New_object_id__140, newObjectId, objectSignatureByte);
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exception, exceptionSignatureByte);
 	}
 	
 	private void printAtNewInstanceCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long arrayTypeId= readReferenceTypeID(in);
 		int length= in.readInt();
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Array_type_id__142, arrayTypeId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Length__143, length); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Array_type_id__142, arrayTypeId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Length__143, length);
 	}
 	
 	private void printAtNewInstanceReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte signatureByte= in.readByte();
 		long newArrayId= readObjectID(in);
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_New_array_id__144, newArrayId, signatureByte); //$NON-NLS-1$
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_New_array_id__144, newArrayId, signatureByte);
 	}
 	
 	private void printMDefaultCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classTypeId= readReferenceTypeID(in);
 		long methodId= readMethodID(in);
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId); //$NON-NLS-1$
-		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId);
+		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId);
 	}
 	
 	private void printMLineTableReply(DataInputStream in) throws IOException {
 		long start= in.readLong();
 		long end= in.readLong();
 		int lines= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Lowest_valid_code_index__147, start); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Highest_valid_code_index__148, end); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Number_of_lines__149, lines); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Lowest_valid_code_index__147, start);
+		println(TcpIpSpyMessages.VerbosePacketStream_Highest_valid_code_index__148, end);
+		println(TcpIpSpyMessages.VerbosePacketStream_Number_of_lines__149, lines);
 		for (int i= 0; i < lines; i++) {
 			long lineCodeIndex= in.readLong();
 			int lineNumber= in.readInt();
-			println(TcpIpSpyMessages.VerbosePacketStream_Line_code_Index__150, lineCodeIndex); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Line_number__151, lineNumber); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_Line_code_Index__150, lineCodeIndex);
+			println(TcpIpSpyMessages.VerbosePacketStream_Line_number__151, lineNumber);
 		}
 	}
 	
 	private void printMVariableTableReply(DataInputStream in) throws IOException {
 		int slotsUsedByArgs= in.readInt();
 		int variablesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_slots_used_by_all_args__152, slotsUsedByArgs); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_variables__153, variablesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_slots_used_by_all_args__152, slotsUsedByArgs);
+		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_variables__153, variablesCount);
 		for (int i= 0; i < variablesCount; i++) {
 			long codeIndex= in.readLong();
 			String name= readString(in);
 			String signature= readString(in);
 			int length= in.readInt();
 			int slotId= in.readInt();
-			println(TcpIpSpyMessages.VerbosePacketStream_First_code_index__154, codeIndex); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Variable_name__155, name); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Variable_type_signature__156, signature); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Code_index_length__157, length); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Slot_id__158, slotId); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_First_code_index__154, codeIndex);
+			println(TcpIpSpyMessages.VerbosePacketStream_Variable_name__155, name);
+			println(TcpIpSpyMessages.VerbosePacketStream_Variable_type_signature__156, signature);
+			println(TcpIpSpyMessages.VerbosePacketStream_Code_index_length__157, length);
+			println(TcpIpSpyMessages.VerbosePacketStream_Slot_id__158, slotId);
 		}
 	}
 	
 	private void printMBytecodesReply(DataInputStream in) throws IOException {
 		int bytes= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_bytes__159, bytes); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_bytes__159, bytes);
 		while((bytes -= in.skipBytes(bytes)) != 0) {
 		}
-		printDescription(TcpIpSpyMessages.VerbosePacketStream_Method_bytes__160); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_skipped_103); //$NON-NLS-1$
+		printDescription(TcpIpSpyMessages.VerbosePacketStream_Method_bytes__160);
+		println(TcpIpSpyMessages.VerbosePacketStream_skipped_103);
 	}
 	
 	private void printMIsObsoleteReply(DataInputStream in) throws IOException {
 		boolean isObsolete= in.readBoolean();
-		println(TcpIpSpyMessages.VerbosePacketStream_Is_obsolete__162, isObsolete); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Is_obsolete__162, isObsolete);
 	}
 	
 	private void printMVariableTableWithGenericReply(DataInputStream in) throws IOException {
 		int slotsUsedByArgs= in.readInt();
 		int variablesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_slots_used_by_all_args__152, slotsUsedByArgs); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_variables__153, variablesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_slots_used_by_all_args__152, slotsUsedByArgs);
+		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_variables__153, variablesCount);
 		for (int i= 0; i < variablesCount; i++) {
 			long codeIndex= in.readLong();
 			String name= readString(in);
@@ -1853,65 +1853,65 @@
 			String genericSignature= readString(in);
 			int length= in.readInt();
 			int slotId= in.readInt();
-			println(TcpIpSpyMessages.VerbosePacketStream_First_code_index__154, codeIndex); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Variable_name__155, name); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Variable_type_signature__156, signature); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Variable_type_generic_signature__425, genericSignature); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Code_index_length__157, length); //$NON-NLS-1$
-			println(TcpIpSpyMessages.VerbosePacketStream_Slot_id__158, slotId); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_First_code_index__154, codeIndex);
+			println(TcpIpSpyMessages.VerbosePacketStream_Variable_name__155, name);
+			println(TcpIpSpyMessages.VerbosePacketStream_Variable_type_signature__156, signature);
+			println(TcpIpSpyMessages.VerbosePacketStream_Variable_type_generic_signature__425, genericSignature);
+			println(TcpIpSpyMessages.VerbosePacketStream_Code_index_length__157, length);
+			println(TcpIpSpyMessages.VerbosePacketStream_Slot_id__158, slotId);
 		}
 	}
 	
 	private void printOrDefaultCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long objectId= readObjectID(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId);
 	}
 	
 	private void printOrReferenceTypeReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte refTypeTag= in.readByte();
 		long typeId= readReferenceTypeID(in);
 		printRefTypeTag(refTypeTag);
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
 	}
 	
 	private void printOrGetValuesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long objectId= readObjectID(in);
 		int fieldsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount);
 		for (int i= 0; i < fieldsCount; i++) {
 			long fieldId= readFieldID(in);
-			println(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
 		}
 	}
 	
 	private void printOrGetValuesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int valuesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount);
 		for (int i= 0; i < valuesCount; i++) {
-			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in); //$NON-NLS-1$
+			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in);
 		}
 	}
 	
 	private void printOrSetValuesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long objectId= readObjectID(in);
 		int fieldsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount); //$NON-NLS-1$
-		throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_List_of_values__NOT_MANAGED_132, remainderData(in)); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Fields_count__108, fieldsCount);
+		throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_List_of_values__NOT_MANAGED_132, remainderData(in));
 	}
 	
 	private void printOrMonitorInfoReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		long ownerThreadId= readObjectID(in);
 		int entryCount= in.readInt();
 		int waiters= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Owner_thread_id__173, ownerThreadId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Entry_count__174, entryCount); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_waiters__175, waiters); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Owner_thread_id__173, ownerThreadId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Entry_count__174, entryCount);
+		println(TcpIpSpyMessages.VerbosePacketStream_Nb_of_waiters__175, waiters);
 		long waiterThreadId;
 		for (int i= 0; i < waiters; i++) {
 			waiterThreadId= readObjectID(in);
-			printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Waiting_thread_id__176, waiterThreadId); //$NON-NLS-1$
+			printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Waiting_thread_id__176, waiterThreadId);
 		}
 	}
 	
@@ -1921,48 +1921,48 @@
 		long classTypeId= readReferenceTypeID(in);
 		long methodId= readMethodID(in);
 		int argsCount= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId); //$NON-NLS-1$
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId); //$NON-NLS-1$
-		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Arguments_count__136, argsCount); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId);
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classTypeId);
+		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream_Method_id__113, methodId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Arguments_count__136, argsCount);
 		for (int i= 0; i < argsCount; i++) {
-			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Argument__137, in); //$NON-NLS-1$
+			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Argument__137, in);
 		}
 		int invocationOption= in.readInt();
 		printInvocationOptions(invocationOption);
 	}
 	
 	private void printOrInvokeMethodReply(DataInputStream in) throws IOException, UnableToParseDataException {
-		readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Return_value__138, in); //$NON-NLS-1$
+		readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Return_value__138, in);
 		byte signatureByte= in.readByte();
 		long exception= readObjectID(in);
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exception, signatureByte); //$NON-NLS-1$
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exception, signatureByte);
 	}
 	
 	private void printOrIsCollectedReply(DataInputStream in) throws IOException {
 		boolean isCollected= in.readBoolean();
-		println(TcpIpSpyMessages.VerbosePacketStream_Is_collected__185, isCollected); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Is_collected__185, isCollected);
 	}
 	
 	private void printSrValueCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long stringObjectId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_String_object_id__186, stringObjectId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_String_object_id__186, stringObjectId);
 	}
 		
 	private void printSrValueReply(DataInputStream in) throws IOException {
 		String value= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Value__120, value); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Value__120, value);
 	}
 	
 	private void printTrDefaultCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
 	}
 	
 	private void printTrNameReply(DataInputStream in) throws IOException {
 		String threadName= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Name__110, threadName); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Name__110, threadName);
 	}
 	
 	private void printTrStatusReply(DataInputStream in) throws IOException {
@@ -1974,108 +1974,108 @@
 	
 	private void printTrThreadGroupReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadGroupId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_group_id__190, threadGroupId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_group_id__190, threadGroupId);
 	}
 	
 	private void printTrFramesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadId= readObjectID(in);
 		int startFrame= in.readInt();
 		int length= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_First_frame__192, startFrame); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Number_of_frame__193, length); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
+		println(TcpIpSpyMessages.VerbosePacketStream_First_frame__192, startFrame);
+		println(TcpIpSpyMessages.VerbosePacketStream_Number_of_frame__193, length);
 	}
 	
 	private void printTrFramesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int framesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Frames_count__194, framesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Frames_count__194, framesCount);
 		for (int i= 0; i < framesCount; i++) {
 			long frameId= readFrameID(in);
-			printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId); //$NON-NLS-1$
+			printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId);
 			readAndPrintLocation(in);
 		}
 	}
 	
 	private void printTrFrameCountReply(DataInputStream in) throws IOException {
 		int framesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Frames_count__194, framesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Frames_count__194, framesCount);
 	}
 	
 	private void printTrOwnedMonitorsReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int monitorsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Monitors_count__197, monitorsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Monitors_count__197, monitorsCount);
 		for (int i= 0; i < monitorsCount; i++) {
 			byte signatureByte= in.readByte();
 			long monitorObjectId= readObjectID(in);
-			printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Monitor_object_id__198, monitorObjectId, signatureByte); //$NON-NLS-1$
+			printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Monitor_object_id__198, monitorObjectId, signatureByte);
 		}
 	}
 	
 	private void printTrCurrentContendedMonitorReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte signatureByte= in.readByte();
 		long monitorObjectId= readObjectID(in);
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Monitor_object_id__198, monitorObjectId, signatureByte); //$NON-NLS-1$
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Monitor_object_id__198, monitorObjectId, signatureByte);
 	}
 	
 	private void printTrStopCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadId= readObjectID(in);
 		long exceptionObjectId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exceptionObjectId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, exceptionObjectId);
 	}
 	
 	private void printTrSuspendCountReply(DataInputStream in) throws IOException {
 		int suspendCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Suspend_count__202, suspendCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Suspend_count__202, suspendCount);
 	}
 	
 	private void printTgrDefaultCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadGroupId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_group_id__190, threadGroupId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_group_id__190, threadGroupId);
 	}
 	
 	private void printTgrNameReply(DataInputStream in) throws IOException {
 		String name= readString(in);
-		println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Name__110, name);
 	}
 	
 	private void printTgrParentReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		long parentThreadGroupId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Parent_thread_group_id__205, parentThreadGroupId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Parent_thread_group_id__205, parentThreadGroupId);
 	}
 	
 	private void printTgrChildrenReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int childThreadsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Child_threads_count__206, childThreadsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Child_threads_count__206, childThreadsCount);
 		for (int i= 0; i < childThreadsCount; i++) {
 			long childThreadId= readObjectID(in);
-			printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Child_thread_id__207, childThreadId); //$NON-NLS-1$
+			printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Child_thread_id__207, childThreadId);
 		}
 		int childGroupThreadsCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Child_group_threads_count__208, childGroupThreadsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Child_group_threads_count__208, childGroupThreadsCount);
 		for (int i= 0; i < childGroupThreadsCount; i++) {
 			long childGroupThreadId= readObjectID(in);
-			printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Child_group_thread_id__209, childGroupThreadId); //$NON-NLS-1$
+			printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Child_group_thread_id__209, childGroupThreadId);
 		}
 	}
 	
 	private void printArLengthCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long arrayObjectId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Array_object_id__210, arrayObjectId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Array_object_id__210, arrayObjectId);
 	}
 	
 	private void printArLengthReply(DataInputStream in) throws IOException {
 		int length= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Length__143, length); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Length__143, length);
 	}
 	
 	private void printArGetValuesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long arrayObjectId= readObjectID(in);
 		int firstIndex= in.readInt();
 		int length= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Array_object_id__210, arrayObjectId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_First_index__213, firstIndex); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Length__214, length); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Array_object_id__210, arrayObjectId);
+		println(TcpIpSpyMessages.VerbosePacketStream_First_index__213, firstIndex);
+		println(TcpIpSpyMessages.VerbosePacketStream_Length__214, length);
 	}
 	
 	private void printArGetValuesReply(DataInputStream in) throws IOException, UnableToParseDataException {
@@ -2086,25 +2086,25 @@
 		long arrayObjectId= readObjectID(in);
 		int firstIndex= in.readInt();
 		int length= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Array_object_id__210, arrayObjectId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_First_index__213, firstIndex); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Length__214, length); //$NON-NLS-1$
-		throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_List_of_values__NOT_MANAGED_132, remainderData(in)); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Array_object_id__210, arrayObjectId);
+		println(TcpIpSpyMessages.VerbosePacketStream_First_index__213, firstIndex);
+		println(TcpIpSpyMessages.VerbosePacketStream_Length__214, length);
+		throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_List_of_values__NOT_MANAGED_132, remainderData(in));
 	}
 	
 	private void printClrVisibleClassesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classLoaderObjectId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Class_loader_object_id__219, classLoaderObjectId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Class_loader_object_id__219, classLoaderObjectId);
 	}
 
 	private void printClrVisibleClassesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int classesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Classes_count__42, classesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Classes_count__42, classesCount);
 		for (int i= 0; i < classesCount; i++) {
 			byte refTypeTag= in.readByte();
 			long typeId= readReferenceTypeID(in);
 			printRefTypeTag(refTypeTag);
-			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
+			printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
 		}
 	}
 	
@@ -2114,75 +2114,75 @@
 		int modifiersCount= in.readInt();
 		printEventKind(eventKind);
 		printSuspendPolicy(suspendPolicy);
-		println(TcpIpSpyMessages.VerbosePacketStream_Modifiers_count__222, modifiersCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Modifiers_count__222, modifiersCount);
 		for (int i= 0; i < modifiersCount; i++) {
 			byte modKind= in.readByte();
-			printDescription(TcpIpSpyMessages.VerbosePacketStream_Modifier_kind__223); //$NON-NLS-1$
+			printDescription(TcpIpSpyMessages.VerbosePacketStream_Modifier_kind__223);
 			printHex(modKind);
 			switch (modKind) {
 				case 1: // count
-					println(TcpIpSpyMessages.VerbosePacketStream___Count__224); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___Count__224);
 					int count= in.readInt();
-					println(TcpIpSpyMessages.VerbosePacketStream_Count__225, count); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream_Count__225, count);
 					break;
 				case 2: // conditional
-					println(TcpIpSpyMessages.VerbosePacketStream___Conditional__226); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___Conditional__226);
 					int exprId= in.readInt();
-					println(TcpIpSpyMessages.VerbosePacketStream_Expression_id__227, exprId); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream_Expression_id__227, exprId);
 					break;
 				case 3: // thread only
-					println(TcpIpSpyMessages.VerbosePacketStream___ThreadOnly__228); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___ThreadOnly__228);
 					long threadId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
 					break;
 				case 4: // class only
-					println(TcpIpSpyMessages.VerbosePacketStream___ClassOnly__230); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___ClassOnly__230);
 					long classId= readReferenceTypeID(in);
-					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classId); //$NON-NLS-1$
+					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Class_type_id__128, classId);
 					break;
 				case 5: // class match
-					println(TcpIpSpyMessages.VerbosePacketStream___ClassMatch__232); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___ClassMatch__232);
 					String classPatern= readString(in);
-					println(TcpIpSpyMessages.VerbosePacketStream_Class_patern__233, classPatern); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream_Class_patern__233, classPatern);
 					break;
 				case 6: // class exclude
-					println(TcpIpSpyMessages.VerbosePacketStream___ClassExclude__234); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___ClassExclude__234);
 					classPatern= readString(in);
-					println(TcpIpSpyMessages.VerbosePacketStream_Class_patern__235, classPatern); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream_Class_patern__235, classPatern);
 					break;
 				case 7:	// location only
-					println(TcpIpSpyMessages.VerbosePacketStream___LocationOnly__236); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___LocationOnly__236);
 					readAndPrintLocation(in);
 					break;
 				case 8:	// exception only
-					println(TcpIpSpyMessages.VerbosePacketStream___ExceptionOnly__237); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___ExceptionOnly__237);
 					long typeId= readReferenceTypeID(in);
 					boolean caught= in.readBoolean();
 					boolean uncaught= in.readBoolean();
-					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Exception_type_id__238, typeId); //$NON-NLS-1$
-					println(TcpIpSpyMessages.VerbosePacketStream_Caught__239, caught); //$NON-NLS-1$
-					println(TcpIpSpyMessages.VerbosePacketStream_Uncaught__240, uncaught); //$NON-NLS-1$
+					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Exception_type_id__238, typeId);
+					println(TcpIpSpyMessages.VerbosePacketStream_Caught__239, caught);
+					println(TcpIpSpyMessages.VerbosePacketStream_Uncaught__240, uncaught);
 					break;
 				case 9: // field only
-					println(TcpIpSpyMessages.VerbosePacketStream___FieldOnly__241); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___FieldOnly__241);
 					long declaringTypeId= readReferenceTypeID(in);
 					long fieldId= readFieldID(in);
-					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Declaring_type_id__242, declaringTypeId); //$NON-NLS-1$
-					printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
+					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Declaring_type_id__242, declaringTypeId);
+					printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
 					break;
 				case 10: // step
-					println(TcpIpSpyMessages.VerbosePacketStream___Step__244); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___Step__244);
 					threadId= readObjectID(in);
 					int stepSize= in.readInt();
 					int stepDepth= in.readInt();
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_id__48, threadId);
 					printStepSize(stepSize);
 					printStepDepth(stepDepth);
 					break;
 				case 11: // instance only
-					println(TcpIpSpyMessages.VerbosePacketStream___InstanceOnly__246); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream___InstanceOnly__246);
 					long objectId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId);
 					break;
 			}
 		}
@@ -2190,35 +2190,35 @@
 	
 	private void printErSetReply(DataInputStream in) throws IOException {
 		int requestId= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Request_id__248, requestId); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Request_id__248, requestId);
 	}
 	
 	private void printErClearCommand(DataInputStream in) throws IOException {
 		byte eventKind= in.readByte();
 		int requestId= in.readInt();
 		printEventKind(eventKind);
-		println(TcpIpSpyMessages.VerbosePacketStream_Request_id__248, requestId); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Request_id__248, requestId);
 	}
 	
 	private void printSfDefaultCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadId= readObjectID(in);
 		long frameId= readFrameID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
-		printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
+		printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId);
 	}
 	
 	private void printSfGetValuesCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long threadId= readObjectID(in);
 		long frameId= readFrameID(in);
 		int slotsCount= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
-		printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Slots_count__254, slotsCount); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
+		printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Slots_count__254, slotsCount);
 		for (int i= 0; i < slotsCount; i++) {
 			int slotIndex= in.readInt();
 			byte signatureTag= in.readByte();
-			println(TcpIpSpyMessages.VerbosePacketStream_Slot_index__255, slotIndex); //$NON-NLS-1$
-			printDescription(TcpIpSpyMessages.VerbosePacketStream_Signature_tag__256); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_Slot_index__255, slotIndex);
+			printDescription(TcpIpSpyMessages.VerbosePacketStream_Signature_tag__256);
 			printSignatureByte(signatureTag, true);
 			println();
 		}
@@ -2226,9 +2226,9 @@
 	
 	private void printSfGetValuesReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		int valuesCount= in.readInt();
-		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount); 
 		for (int i= 0; i < valuesCount; i++) {
-			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in); //$NON-NLS-1$
+			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in);
 		}
 	}
 	
@@ -2236,55 +2236,55 @@
 		long threadId= readObjectID(in);
 		long frameId= readFrameID(in);
 		int slotsCount= in.readInt();
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
-		printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream_Slots_count__254, slotsCount); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
+		printlnFrameId(TcpIpSpyMessages.VerbosePacketStream_Frame_id__195, frameId);
+		println(TcpIpSpyMessages.VerbosePacketStream_Slots_count__254, slotsCount);
 		for (int i= 0; i < slotsCount; i++) {
 			int slotIndex= in.readInt();
-			println(TcpIpSpyMessages.VerbosePacketStream_Slot_index__255, slotIndex); //$NON-NLS-1$
-			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Values__263, in); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_Slot_index__255, slotIndex);
+			readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Values__263, in);
 		}
 	}
 	
 	private void printSfThisObjectReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte signatureByte= in.readByte();
 		long objectId= readObjectID(in);
-		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream___this___object_id__264, objectId, signatureByte); //$NON-NLS-1$
+		printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream___this___object_id__264, objectId, signatureByte);
 	}
 	
 	private void printCorReflectedTypeCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		long classObjectId= readObjectID(in);
-		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Class_object_id__126, classObjectId); //$NON-NLS-1$
+		printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Class_object_id__126, classObjectId);
 	}
 	
 	private void printCorReflectedTypeReply(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte refTypeTag= in.readByte();
 		long typeId= readReferenceTypeID(in);
 		printRefTypeTag(refTypeTag);
-		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
+		printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
 	}
 
 	private void printECompositeCommand(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte suspendPolicy= in.readByte();
 		int eventsCount= in.readInt();
 		printSuspendPolicy(suspendPolicy);
-		println(TcpIpSpyMessages.VerbosePacketStream_Events_count__267, eventsCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Events_count__267, eventsCount);
 		for (int i= 0; i < eventsCount; i++) {
 			byte eventKind= in.readByte();
 			int requestId= in.readInt();
 			printEventKind(eventKind);
-			println(TcpIpSpyMessages.VerbosePacketStream_Request_id__248, requestId); //$NON-NLS-1$
+			println(TcpIpSpyMessages.VerbosePacketStream_Request_id__248, requestId);
 			switch (eventKind) {
 				case EVENTKIND_VM_START:
 					long threadId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Initial_thread_object_id__269, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Initial_thread_object_id__269, threadId);
 					break;
 				case EVENTKIND_SINGLE_STEP:
 				case EVENTKIND_BREAKPOINT:
 				case EVENTKIND_METHOD_ENTRY:
 				case EVENTKIND_METHOD_EXIT:
 					threadId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); 
 					readAndPrintLocation(in);
 					break;
 				case EVENTKIND_EXCEPTION:
@@ -2292,13 +2292,13 @@
 					readAndPrintLocation(in);
 					byte signatureByte= in.readByte();
 					long objectId= readObjectID(in);
-					printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, objectId, signatureByte); //$NON-NLS-1$
+					printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Exception_object_id__139, objectId, signatureByte);
 					readAndPrintLocation(in);
 					break;
 				case EVENTKIND_THREAD_START:
 				case EVENTKIND_THREAD_DEATH:
 					threadId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
 					break;
 				case EVENTKIND_CLASS_PREPARE:
 					threadId= readObjectID(in);
@@ -2306,19 +2306,19 @@
 					long typeId= readReferenceTypeID(in);
 					String typeSignature= readString(in);
 					int status= in.readInt();
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
 					printRefTypeTag(refTypeTag);
-					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
-					println(TcpIpSpyMessages.VerbosePacketStream_Type_signature__275, typeSignature); //$NON-NLS-1$
-					println(TcpIpSpyMessages.VerbosePacketStream_Status__276, status); //$NON-NLS-1$
+					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
+					println(TcpIpSpyMessages.VerbosePacketStream_Type_signature__275, typeSignature);
+					println(TcpIpSpyMessages.VerbosePacketStream_Status__276, status);
 					break;
 				case EVENTKIND_CLASS_UNLOAD:
 					typeSignature= readString(in);
-					println(TcpIpSpyMessages.VerbosePacketStream_Type_signature__275, typeSignature); //$NON-NLS-1$
+					println(TcpIpSpyMessages.VerbosePacketStream_Type_signature__275, typeSignature);
 					break;
 				case EVENTKIND_FIELD_ACCESS:
 					threadId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
 					readAndPrintLocation(in);
 					refTypeTag= in.readByte();
 					typeId= readReferenceTypeID(in);
@@ -2326,13 +2326,13 @@
 					signatureByte= in.readByte();
 					objectId= readObjectID(in);
 					printRefTypeTag(refTypeTag);
-					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
-					printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
-					printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId, signatureByte); //$NON-NLS-1$
+					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
+					printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
+					printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId, signatureByte);
 					break;
 				case EVENTKIND_FIELD_MODIFICATION:
 					threadId= readObjectID(in);
-					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId); //$NON-NLS-1$
+					printlnObjectId(TcpIpSpyMessages.VerbosePacketStream_Thread_object_id__250, threadId);
 					readAndPrintLocation(in);
 					refTypeTag= in.readByte();
 					typeId= readReferenceTypeID(in);
@@ -2340,10 +2340,10 @@
 					signatureByte= in.readByte();
 					objectId= readObjectID(in);
 					printRefTypeTag(refTypeTag);
-					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId); //$NON-NLS-1$
-					printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId); //$NON-NLS-1$
-					printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId, signatureByte); //$NON-NLS-1$
-					readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in); //$NON-NLS-1$
+					printlnReferenceTypeId(TcpIpSpyMessages.VerbosePacketStream_Type_id__43, typeId);
+					printlnFieldId(TcpIpSpyMessages.VerbosePacketStream_Field_id__109, fieldId);
+					printlnTaggedObjectId(TcpIpSpyMessages.VerbosePacketStream_Object_id__72, objectId, signatureByte);
+					readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value__120, in);
 					break;
 				case EVENTKIND_VM_DEATH:
 					break;
@@ -2371,7 +2371,7 @@
 				int b = utfBytes[i + 1] & 0xFF;
 				if ((a >> 4) < 14) {
 					if ((b & 0xBF) == 0) {
-						throw new UTFDataFormatException(TcpIpSpyMessages.VerbosePacketStream_Second_byte_input_does_not_match_UTF_Specification_287); //$NON-NLS-1$
+						throw new UTFDataFormatException(TcpIpSpyMessages.VerbosePacketStream_Second_byte_input_does_not_match_UTF_Specification_287);
 					}
 					strBuffer.append((char) (((a & 0x1F) << 6) | (b & 0x3F)));
 					i += 2;
@@ -2379,12 +2379,12 @@
 					int c = utfBytes[i + 2] & 0xFF;
 					if ((a & 0xEF) > 0) {
 						if (((b & 0xBF) == 0) || ((c & 0xBF) == 0)) {
-							throw new UTFDataFormatException(TcpIpSpyMessages.VerbosePacketStream_Second_or_third_byte_input_does_not_mach_UTF_Specification__288); //$NON-NLS-1$
+							throw new UTFDataFormatException(TcpIpSpyMessages.VerbosePacketStream_Second_or_third_byte_input_does_not_mach_UTF_Specification__288);
 						}
 						strBuffer.append((char) (((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F)));
 						i += 3;
 					} else {
-						throw new UTFDataFormatException(TcpIpSpyMessages.VerbosePacketStream_Input_does_not_match_UTF_Specification_289); //$NON-NLS-1$
+						throw new UTFDataFormatException(TcpIpSpyMessages.VerbosePacketStream_Input_does_not_match_UTF_Specification_289);
 					}
 				}
 			}
@@ -2408,35 +2408,35 @@
 	
 	private long readObjectID(DataInputStream in) throws IOException, UnableToParseDataException {
 		if (!TcpipSpy.hasSizes()) {
-			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in)); //$NON-NLS-1$
+			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in));
 		}
 		return readID(in, TcpipSpy.getObjectIDSize());
 	}
 
 	private long readReferenceTypeID(DataInputStream in) throws IOException, UnableToParseDataException {
 		if (!TcpipSpy.hasSizes()) {
-			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in)); //$NON-NLS-1$
+			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in));
 		}
 		return readID(in, TcpipSpy.getReferenceTypeIDSize());
 	}
 
 	private long readFieldID(DataInputStream in) throws IOException, UnableToParseDataException {
 		if (!TcpipSpy.hasSizes()) {
-			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in)); //$NON-NLS-1$
+			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in));
 		}
 		return readID(in, TcpipSpy.getFieldIDSize());
 	}
 
 	private long readMethodID(DataInputStream in) throws IOException, UnableToParseDataException {
 		if (!TcpipSpy.hasSizes()) {
-			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in)); //$NON-NLS-1$
+			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in));
 		}
 		return readID(in, TcpipSpy.getMethodIDSize());
 	}
 
 	private long readFrameID(DataInputStream in) throws IOException, UnableToParseDataException {
 		if (!TcpipSpy.hasSizes()) {
-			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in)); //$NON-NLS-1$
+			throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in));
 		}
 		return readID(in, TcpipSpy.getFrameIDSize());
 	}
@@ -2498,7 +2498,7 @@
 			case CLASS_LOADER_TAG:
 			case CLASS_OBJECT_TAG:
 				if (!TcpipSpy.hasSizes()) {
-					throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in)); //$NON-NLS-1$
+					throw new UnableToParseDataException(TcpIpSpyMessages.VerbosePacketStream_Unable_to_parse_remaining_data_290, remainderData(in));
 				}
 				size= TcpipSpy.getObjectIDSize();
 				isId= true;
@@ -2600,7 +2600,7 @@
 				type= "class object id"; //$NON-NLS-1$
 				break;
 			default:
-				type= TcpIpSpyMessages.VerbosePacketStream_unknow_20; //$NON-NLS-1$
+				type= TcpIpSpyMessages.VerbosePacketStream_unknow_20;
 				break;
 		}
 		if (printValue) {
@@ -2619,18 +2619,18 @@
 		long classId= readReferenceTypeID(in);
 		long methodId= readMethodID(in);
 		long index= in.readLong();
-		printlnReferenceTypeIdWithTypeTag(TcpIpSpyMessages.VerbosePacketStream_Location__class_id__297, classId, typeTag); //$NON-NLS-1$
-		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream___________method_id__298, methodId); //$NON-NLS-1$
-		println(TcpIpSpyMessages.VerbosePacketStream___________index__299, index); //$NON-NLS-1$
+		printlnReferenceTypeIdWithTypeTag(TcpIpSpyMessages.VerbosePacketStream_Location__class_id__297, classId, typeTag);
+		printlnMethodId(TcpIpSpyMessages.VerbosePacketStream___________method_id__298, methodId);
+		println(TcpIpSpyMessages.VerbosePacketStream___________index__299, index);
 	}
 	
 	private void readAndPrintArrayRegion(DataInputStream in) throws IOException, UnableToParseDataException {
 		byte signatureByte= in.readByte();
 		int valuesCount= in.readInt();
-		printDescription(TcpIpSpyMessages.VerbosePacketStream_Signature_byte__300); //$NON-NLS-1$
+		printDescription(TcpIpSpyMessages.VerbosePacketStream_Signature_byte__300);
 		printSignatureByte(signatureByte, true);
 		println();
-		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount); //$NON-NLS-1$
+		println(TcpIpSpyMessages.VerbosePacketStream_Values_count__119, valuesCount);
 		switch (signatureByte) {
 			case ARRAY_TAG:
 			case OBJECT_TAG:
@@ -2640,12 +2640,12 @@
 			case CLASS_LOADER_TAG:
 			case CLASS_OBJECT_TAG:
 				for (int i= 0; i < valuesCount; i ++) {
-					readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value_302, in); //$NON-NLS-1$
+					readAndPrintlnTaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value_302, in);
 				}
 				break;
 			default:
 				for (int i= 0; i < valuesCount; i ++) {
-					readAndPrintlnUntaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value_302, in, signatureByte, false); //$NON-NLS-1$
+					readAndPrintlnUntaggedValue(TcpIpSpyMessages.VerbosePacketStream_Value_302, in, signatureByte, false);
 				}
 				break;
 		}