diff --git a/openwire-dotnet/.project b/openwire-dotnet/.project
deleted file mode 100644
index 8823445244..0000000000
--- a/openwire-dotnet/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>openwire-dotnet</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/openwire-dotnet/openwire-dotnet.sln b/openwire-dotnet/openwire-dotnet.sln
deleted file mode 100644
index 6555afce78..0000000000
--- a/openwire-dotnet/openwire-dotnet.sln
+++ /dev/null
@@ -1,24 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "src", "src/src.csproj", "{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests/tests.csproj", "{B409B247-A311-42A9-B68D-76054D63DD7D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B409B247-A311-42A9-B68D-76054D63DD7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B409B247-A311-42A9-B68D-76054D63DD7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B409B247-A311-42A9-B68D-76054D63DD7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B409B247-A311-42A9-B68D-76054D63DD7D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/openwire-dotnet/src/src.csproj b/openwire-dotnet/src/src.csproj
deleted file mode 100644
index cc136d2c89..0000000000
--- a/openwire-dotnet/src/src.csproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProductVersion>8.0.30703</ProductVersion>
-        <SchemaVersion>2.0</SchemaVersion>
-        <ProjectGuid>{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <RootNamespace>src</RootNamespace>
-        <AssemblyName>src</AssemblyName>
-        <WarningLevel>4</WarningLevel>
-        <StartupObject/>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugSymbols>false</DebugSymbols>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets"/>
-    <ItemGroup>
-        <Compile Include="ActiveMQ\BrokerException.cs"/>
-        <Compile Include="ActiveMQ\Commands\AbstractCommand.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQBytesMessage.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQDestination.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQMapMessage.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQMessage.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQObjectMessage.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQQueue.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQStreamMessage.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQTempDestination.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQTempQueue.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQTempTopic.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQTextMessage.cs"/>
-        <Compile Include="ActiveMQ\Commands\ActiveMQTopic.cs"/>
-        <Compile Include="ActiveMQ\Commands\BaseCommand.cs"/>
-        <Compile Include="ActiveMQ\Commands\BrokerError.cs"/>
-        <Compile Include="ActiveMQ\Commands\BrokerId.cs"/>
-        <Compile Include="ActiveMQ\Commands\BrokerInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\Command.cs"/>
-        <Compile Include="ActiveMQ\Commands\ConnectionError.cs"/>
-        <Compile Include="ActiveMQ\Commands\ConnectionId.cs"/>
-        <Compile Include="ActiveMQ\Commands\ConnectionInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\ConsumerId.cs"/>
-        <Compile Include="ActiveMQ\Commands\ConsumerInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\ControlCommand.cs"/>
-        <Compile Include="ActiveMQ\Commands\DataArrayResponse.cs"/>
-        <Compile Include="ActiveMQ\Commands\DataResponse.cs"/>
-        <Compile Include="ActiveMQ\Commands\DataStructure.cs"/>
-        <Compile Include="ActiveMQ\Commands\DataStructureSupport.cs"/>
-        <Compile Include="ActiveMQ\Commands\DestinationInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\DiscoveryEvent.cs"/>
-        <Compile Include="ActiveMQ\Commands\ExceptionResponse.cs"/>
-        <Compile Include="ActiveMQ\Commands\FlushCommand.cs"/>
-        <Compile Include="ActiveMQ\Commands\IntegerResponse.cs"/>
-        <Compile Include="ActiveMQ\Commands\JournalQueueAck.cs"/>
-        <Compile Include="ActiveMQ\Commands\JournalTopicAck.cs"/>
-        <Compile Include="ActiveMQ\Commands\JournalTrace.cs"/>
-        <Compile Include="ActiveMQ\Commands\JournalTransaction.cs"/>
-        <Compile Include="ActiveMQ\Commands\KeepAliveInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\LocalTransactionId.cs"/>
-        <Compile Include="ActiveMQ\Commands\MarshallAware.cs"/>
-        <Compile Include="ActiveMQ\Commands\Message.cs"/>
-        <Compile Include="ActiveMQ\Commands\MessageAck.cs"/>
-        <Compile Include="ActiveMQ\Commands\MessageDispatch.cs"/>
-        <Compile Include="ActiveMQ\Commands\MessageDispatchNotification.cs"/>
-        <Compile Include="ActiveMQ\Commands\MessageId.cs"/>
-        <Compile Include="ActiveMQ\Commands\ProducerId.cs"/>
-        <Compile Include="ActiveMQ\Commands\ProducerInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\RemoveInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\RemoveSubscriptionInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\Response.cs"/>
-        <Compile Include="ActiveMQ\Commands\SessionId.cs"/>
-        <Compile Include="ActiveMQ\Commands\SessionInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\ShutdownInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\SubscriptionInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\TransactionId.cs"/>
-        <Compile Include="ActiveMQ\Commands\TransactionInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\WireFormatInfo.cs"/>
-        <Compile Include="ActiveMQ\Commands\XATransactionId.cs"/>
-        <Compile Include="ActiveMQ\Connection.cs"/>
-        <Compile Include="ActiveMQ\ConnectionClosedException.cs"/>
-        <Compile Include="ActiveMQ\ConnectionFactory.cs"/>
-        <Compile Include="ActiveMQ\ConsumerClosedException.cs"/>
-        <Compile Include="ActiveMQ\DestinationFilter.cs"/>
-        <Compile Include="ActiveMQ\Dispatcher.cs"/>
-        <Compile Include="ActiveMQ\ISynchronization.cs"/>
-        <Compile Include="ActiveMQ\MessageConsumer.cs"/>
-        <Compile Include="ActiveMQ\MessageProducer.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\BaseDataStreamMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\BooleanStream.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\EndianSupport.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\MessagePropertyHelper.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\OpenWireBinaryReader.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\OpenWireBinaryWriter.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\OpenWireFormat.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\PrimitiveMap.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQBytesMessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQDestinationMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQMapMessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQMessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQObjectMessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQQueueMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQStreamMessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQTempDestinationMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQTempQueueMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQTempTopicMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQTextMessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ActiveMQTopicMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\BaseCommandMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\BrokerIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\BrokerInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ConnectionErrorMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ConnectionIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ConnectionInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ConsumerIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ConsumerInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ControlCommandMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\DataArrayResponseMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\DataResponseMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\DataStructureSupportMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\DestinationInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\DiscoveryEventMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ExceptionResponseMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\FlushCommandMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\IntegerResponseMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\JournalQueueAckMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\JournalTopicAckMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\JournalTraceMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\JournalTransactionMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\KeepAliveInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\LocalTransactionIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\MarshallerFactory.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\MessageAckMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\MessageDispatchMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\MessageDispatchNotificationMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\MessageIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\MessageMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ProducerIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ProducerInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\RemoveInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\RemoveSubscriptionInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ResponseMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\SessionIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\SessionInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\ShutdownInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\SubscriptionInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\TransactionIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\TransactionInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\WireFormatInfoMarshaller.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\V1\XATransactionIdMarshaller.cs"/>
-        <Compile Include="ActiveMQ\Session.cs"/>
-        <Compile Include="ActiveMQ\TransactionContext.cs"/>
-        <Compile Include="ActiveMQ\Transport\FutureResponse.cs"/>
-        <Compile Include="ActiveMQ\Transport\ITransport.cs"/>
-        <Compile Include="ActiveMQ\Transport\ITransportFactory.cs"/>
-        <Compile Include="ActiveMQ\Transport\LoggingTransport.cs"/>
-        <Compile Include="ActiveMQ\Transport\MutexTransport.cs"/>
-        <Compile Include="ActiveMQ\Transport\ResponseCorrelator.cs"/>
-        <Compile Include="ActiveMQ\Transport\Tcp\TcpTransport.cs"/>
-        <Compile Include="ActiveMQ\Transport\Tcp\TcpTransportFactory.cs"/>
-        <Compile Include="ActiveMQ\Transport\TransportFilter.cs"/>
-        <Compile Include="JMS\IBytesMessage.cs"/>
-        <Compile Include="JMS\IConnection.cs"/>
-        <Compile Include="JMS\IConnectionFactory.cs"/>
-        <Compile Include="JMS\IDestination.cs"/>
-        <Compile Include="JMS\IMapMessage.cs"/>
-        <Compile Include="JMS\IMessage.cs"/>
-        <Compile Include="JMS\IMessageConsumer.cs"/>
-        <Compile Include="JMS\IMessageProducer.cs"/>
-        <Compile Include="JMS\IPrimitiveMap.cs"/>
-        <Compile Include="JMS\IQueue.cs"/>
-        <Compile Include="JMS\ISession.cs"/>
-        <Compile Include="JMS\IStartable.cs"/>
-        <Compile Include="JMS\IStoppable.cs"/>
-        <Compile Include="JMS\ITemporaryQueue.cs"/>
-        <Compile Include="JMS\ITemporaryTopic.cs"/>
-        <Compile Include="JMS\ITextMessage.cs"/>
-        <Compile Include="JMS\ITopic.cs"/>
-        <None Include="JMS\JMSConnectionException.cs"/>
-        <Compile Include="JMS\JMSException.cs"/>
-    </ItemGroup>
-</Project>
diff --git a/openwire-dotnet/tests/tests.csproj b/openwire-dotnet/tests/tests.csproj
deleted file mode 100644
index 8b3a017ff5..0000000000
--- a/openwire-dotnet/tests/tests.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProductVersion>8.0.30703</ProductVersion>
-        <SchemaVersion>2.0</SchemaVersion>
-        <ProjectGuid>{B409B247-A311-42A9-B68D-76054D63DD7D}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <RootNamespace>tests</RootNamespace>
-        <AssemblyName>tests</AssemblyName>
-        <WarningLevel>4</WarningLevel>
-        <StartupObject/>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugSymbols>false</DebugSymbols>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="nunit.core"/>
-        <Reference Include="nunit.framework"/>
-        <Reference Include="System"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets"/>
-    <ItemGroup>
-        <ProjectReference Include="../src/src.csproj">
-            <Name>src</Name>
-            <Project>{F7BA9EF7-ADF7-40EF-9A9E-206649DBB10C}</Project>
-        </ProjectReference>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="ActiveMQ\Commands\CommandTest.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\BooleanStreamTest.cs"/>
-        <Compile Include="ActiveMQ\OpenWire\EndianTest.cs"/>
-        <Compile Include="ActiveMQ\TestMain.cs"/>
-        <Compile Include="JMS\AsyncConsumeTest.cs"/>
-        <Compile Include="JMS\BadConsumeTest.cs"/>
-        <Compile Include="JMS\BytesMessageTest.cs"/>
-        <Compile Include="JMS\ConsumerTest.cs"/>
-        <Compile Include="JMS\JMSPropertyTest.cs"/>
-        <Compile Include="JMS\JMSTestSupport.cs"/>
-        <Compile Include="JMS\MapMessageTest.cs"/>
-        <Compile Include="JMS\MessageTest.cs"/>
-        <Compile Include="JMS\TextMessage.cs"/>
-        <Compile Include="JMS\TransactionTest.cs"/>
-    </ItemGroup>
-</Project>