diff --git a/src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj b/src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj
deleted file mode 100644
index ae05359a1..000000000
--- a/src/BuildingBlocks/CommandBus/CommandBus/CommandBus.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
-    <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.CommandBus</RootNamespace>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs b/src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs
deleted file mode 100644
index 2092e11b0..000000000
--- a/src/BuildingBlocks/CommandBus/CommandBus/ICommandBus.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
-{
-    public interface ICommandBus
-    {
-        Task SendAsync<T>(T command) where T : IntegrationCommand;
-
-    }
-}
diff --git a/src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs b/src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs
deleted file mode 100644
index 36f1f0fdc..000000000
--- a/src/BuildingBlocks/CommandBus/CommandBus/IntegrationCommand.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
-{
-    public abstract class IntegrationCommand
-    {
-        public Guid Id { get; private set; }
-        public DateTime Sent { get; private set; }
-
-        protected IntegrationCommand()
-        {
-            Id = Guid.NewGuid();
-            Sent = DateTime.UtcNow;
-        }
-    }
-}
diff --git a/src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj b/src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj
deleted file mode 100644
index 954020d10..000000000
--- a/src/BuildingBlocks/CommandBus/CommandBusRabbitMQ/CommandBusRabbitMQ.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj b/src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj
deleted file mode 100644
index 7c3327057..000000000
--- a/src/BuildingBlocks/EventBus/CommandBus/CommandBus.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
-    <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.CommandBus</RootNamespace>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs b/src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs
deleted file mode 100644
index 813d9406c..000000000
--- a/src/BuildingBlocks/EventBus/CommandBus/ICommandBus.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
-{
-    public interface ICommandBus
-    {
-        void Send<T>(string name, T data);
-        void Handle<TC>(string name, IIntegrationCommandHandler<TC> handler);
-        void Handle(string name, IIntegrationCommandHandler handler);
-        void Handle<TI, TC>(TI handler) 
-            where TI : IIntegrationCommandHandler<TC>;
-    }
-}
diff --git a/src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs b/src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs
deleted file mode 100644
index 07f0c1eea..000000000
--- a/src/BuildingBlocks/EventBus/CommandBus/IIntegrationCommandHandler.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
-{
-    public interface IIntegrationCommandHandler
-    {
-        void Handle(IntegrationCommand command);
-    }
-
-    public interface IIntegrationCommandHandler<T> : IIntegrationCommandHandler
-    {
-        void Handle(IntegrationCommand<T> command);
-    }
-}
diff --git a/src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs b/src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs
deleted file mode 100644
index 8df6e5279..000000000
--- a/src/BuildingBlocks/EventBus/CommandBus/IntegrationCommand.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.eShopOnContainers.BuildingBlocks.CommandBus
-{
-    public abstract class IntegrationCommand
-    {
-        public Guid Id { get; }
-        public DateTime Sent { get; }
-
-        public abstract object GetDataAsObject();
-
-        protected IntegrationCommand()
-        {
-            Id = Guid.NewGuid();
-            Sent = DateTime.UtcNow;
-        }
-
-    }
-
-    public class IntegrationCommand<T> : IntegrationCommand
-    {
-        public T Data { get; }
-        public string Name { get; }
-        public override object GetDataAsObject() => Data;
-
-        public IntegrationCommand(string name, T data) : base()
-        {
-            Data = data;
-            Name = name;
-        }
-    }
-
-}