diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c
index 4a914fa2..0c5f4bdd 100644
--- a/bacnet-stack/demo/epics/main.c
+++ b/bacnet-stack/demo/epics/main.c
@@ -1134,8 +1134,8 @@ void PrintHeading(
      * and show them
      */
     if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING)) {
-        printf("-- services reported by this device\r\n");
         int i, len = bitstring_bits_used(&value->type.Bit_String);
+        printf("-- services reported by this device\r\n");
         for (i = 0; i < len; i++) {
             if (bitstring_bit(&value->type.Bit_String, (uint8_t) i))
                 printf(" %s\r\n", protocol_services_supported_text(i));
@@ -1181,8 +1181,8 @@ void PrintHeading(
      * and show them
      */
     if ((value != NULL) && (value->tag == BACNET_APPLICATION_TAG_BIT_STRING)) {
-        printf("-- objects reported by this device\r\n");
         int i, len = bitstring_bits_used(&value->type.Bit_String);
+        printf("-- objects reported by this device\r\n");
         for (i = 0; i < len; i++) {
             if (bitstring_bit(&value->type.Bit_String, (uint8_t) i))
                 printf(" %s\r\n", bactext_object_type_name(i));
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index b067b5b9..1c12d768 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -194,6 +194,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#if 0        
     {OBJECT_CHARACTERSTRING_VALUE,
             CharacterString_Value_Init,
             CharacterString_Value_Count,
@@ -209,6 +210,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#endif        
 #if defined(INTRINSIC_REPORTING)
     {OBJECT_NOTIFICATION_CLASS,
             Notification_Class_Init,
@@ -286,6 +288,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#if 0
     {OBJECT_MULTI_STATE_VALUE,
             Multistate_Value_Init,
             Multistate_Value_Count,
@@ -301,6 +304,7 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#endif        
     {OBJECT_TRENDLOG,
             Trend_Log_Init,
             Trend_Log_Count,
diff --git a/bacnet-stack/ports/win32/Microsoft Visual Studio 2008/BACnet Object Definitions/BACnet Object Definitions.vcproj b/bacnet-stack/ports/win32/Microsoft Visual Studio 2008/BACnet Object Definitions/BACnet Object Definitions.vcproj
index 14316a78..6f33ddf5 100644
--- a/bacnet-stack/ports/win32/Microsoft Visual Studio 2008/BACnet Object Definitions/BACnet Object Definitions.vcproj	
+++ b/bacnet-stack/ports/win32/Microsoft Visual Studio 2008/BACnet Object Definitions/BACnet Object Definitions.vcproj	
@@ -246,18 +246,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\..\demo\object\gw_device.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\..\..\include"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\..\..\demo\object\lc.c"
 				>