merge

8 files changed, 0 insertions, 1506 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItem.cs b/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItem.cs
deleted file mode 100644
index f560237ae..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItem.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: DataStoreItem.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from DataStoreItem.proto</summary>
-  public static partial class DataStoreItemReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for DataStoreItem.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static DataStoreItemReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChNEYXRhU3RvcmVJdGVtLnByb3RvEhNUYW5nby5QTVIuRGF0YVN0b3JlGg5E",
-            "YXRhVHlwZS5wcm90bxoRTWVzc2FnZVR5cGUucHJvdG8i7gEKDURhdGFTdG9y",
-            "ZUl0ZW0SLwoIRGF0YVR5cGUYASABKA4yHS5UYW5nby5QTVIuRGF0YVN0b3Jl",
-            "LkRhdGFUeXBlEhIKCkludDMyVmFsdWUYAiABKAUSEgoKRmxvYXRWYWx1ZRgD",
-            "IAEoAhITCgtEb3VibGVWYWx1ZRgEIAEoARIUCgxCb29sZWFuVmFsdWUYBSAB",
-            "KAgSEwoLU3RyaW5nVmFsdWUYBiABKAkSEgoKQnl0ZXNWYWx1ZRgHIAEoDBIw",
-            "CglQcm90b1R5cGUYFCABKA4yHS5UYW5nby5QTVIuQ29tbW9uLk1lc3NhZ2VU",
-            "eXBlQh8KHWNvbS50d2luZS50YW5nby5wbXIuZGF0YXN0b3JlYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.DataStore.DataTypeReflection.Descriptor, global::Tango.PMR.Common.MessageTypeReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.DataStoreItem), global::Tango.PMR.DataStore.DataStoreItem.Parser, new[]{ "DataType", "Int32Value", "FloatValue", "DoubleValue", "BooleanValue", "StringValue", "BytesValue", "ProtoType" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class DataStoreItem : pb::IMessage<DataStoreItem> {
-    private static readonly pb::MessageParser<DataStoreItem> _parser = new pb::MessageParser<DataStoreItem>(() => new DataStoreItem());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<DataStoreItem> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.DataStoreItemReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItem() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItem(DataStoreItem other) : this() {
-      dataType_ = other.dataType_;
-      int32Value_ = other.int32Value_;
-      floatValue_ = other.floatValue_;
-      doubleValue_ = other.doubleValue_;
-      booleanValue_ = other.booleanValue_;
-      stringValue_ = other.stringValue_;
-      bytesValue_ = other.bytesValue_;
-      protoType_ = other.protoType_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItem Clone() {
-      return new DataStoreItem(this);
-    }
-
-    /// <summary>Field number for the "DataType" field.</summary>
-    public const int DataTypeFieldNumber = 1;
-    private global::Tango.PMR.DataStore.DataType dataType_ = 0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.DataStore.DataType DataType {
-      get { return dataType_; }
-      set {
-        dataType_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Int32Value" field.</summary>
-    public const int Int32ValueFieldNumber = 2;
-    private int int32Value_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int Int32Value {
-      get { return int32Value_; }
-      set {
-        int32Value_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "FloatValue" field.</summary>
-    public const int FloatValueFieldNumber = 3;
-    private float floatValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public float FloatValue {
-      get { return floatValue_; }
-      set {
-        floatValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "DoubleValue" field.</summary>
-    public const int DoubleValueFieldNumber = 4;
-    private double doubleValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public double DoubleValue {
-      get { return doubleValue_; }
-      set {
-        doubleValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "BooleanValue" field.</summary>
-    public const int BooleanValueFieldNumber = 5;
-    private bool booleanValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool BooleanValue {
-      get { return booleanValue_; }
-      set {
-        booleanValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "StringValue" field.</summary>
-    public const int StringValueFieldNumber = 6;
-    private string stringValue_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string StringValue {
-      get { return stringValue_; }
-      set {
-        stringValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "BytesValue" field.</summary>
-    public const int BytesValueFieldNumber = 7;
-    private pb::ByteString bytesValue_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public pb::ByteString BytesValue {
-      get { return bytesValue_; }
-      set {
-        bytesValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "ProtoType" field.</summary>
-    public const int ProtoTypeFieldNumber = 20;
-    private global::Tango.PMR.Common.MessageType protoType_ = 0;
-    /// <summary>
-    ///Use only when DataType = Proto.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Common.MessageType ProtoType {
-      get { return protoType_; }
-      set {
-        protoType_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as DataStoreItem);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(DataStoreItem other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (DataType != other.DataType) return false;
-      if (Int32Value != other.Int32Value) return false;
-      if (FloatValue != other.FloatValue) return false;
-      if (DoubleValue != other.DoubleValue) return false;
-      if (BooleanValue != other.BooleanValue) return false;
-      if (StringValue != other.StringValue) return false;
-      if (BytesValue != other.BytesValue) return false;
-      if (ProtoType != other.ProtoType) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (DataType != 0) hash ^= DataType.GetHashCode();
-      if (Int32Value != 0) hash ^= Int32Value.GetHashCode();
-      if (FloatValue != 0F) hash ^= FloatValue.GetHashCode();
-      if (DoubleValue != 0D) hash ^= DoubleValue.GetHashCode();
-      if (BooleanValue != false) hash ^= BooleanValue.GetHashCode();
-      if (StringValue.Length != 0) hash ^= StringValue.GetHashCode();
-      if (BytesValue.Length != 0) hash ^= BytesValue.GetHashCode();
-      if (ProtoType != 0) hash ^= ProtoType.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (DataType != 0) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) DataType);
-      }
-      if (Int32Value != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Int32Value);
-      }
-      if (FloatValue != 0F) {
-        output.WriteRawTag(29);
-        output.WriteFloat(FloatValue);
-      }
-      if (DoubleValue != 0D) {
-        output.WriteRawTag(33);
-        output.WriteDouble(DoubleValue);
-      }
-      if (BooleanValue != false) {
-        output.WriteRawTag(40);
-        output.WriteBool(BooleanValue);
-      }
-      if (StringValue.Length != 0) {
-        output.WriteRawTag(50);
-        output.WriteString(StringValue);
-      }
-      if (BytesValue.Length != 0) {
-        output.WriteRawTag(58);
-        output.WriteBytes(BytesValue);
-      }
-      if (ProtoType != 0) {
-        output.WriteRawTag(160, 1);
-        output.WriteEnum((int) ProtoType);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (DataType != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) DataType);
-      }
-      if (Int32Value != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Int32Value);
-      }
-      if (FloatValue != 0F) {
-        size += 1 + 4;
-      }
-      if (DoubleValue != 0D) {
-        size += 1 + 8;
-      }
-      if (BooleanValue != false) {
-        size += 1 + 1;
-      }
-      if (StringValue.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringValue);
-      }
-      if (BytesValue.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(BytesValue);
-      }
-      if (ProtoType != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) ProtoType);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(DataStoreItem other) {
-      if (other == null) {
-        return;
-      }
-      if (other.DataType != 0) {
-        DataType = other.DataType;
-      }
-      if (other.Int32Value != 0) {
-        Int32Value = other.Int32Value;
-      }
-      if (other.FloatValue != 0F) {
-        FloatValue = other.FloatValue;
-      }
-      if (other.DoubleValue != 0D) {
-        DoubleValue = other.DoubleValue;
-      }
-      if (other.BooleanValue != false) {
-        BooleanValue = other.BooleanValue;
-      }
-      if (other.StringValue.Length != 0) {
-        StringValue = other.StringValue;
-      }
-      if (other.BytesValue.Length != 0) {
-        BytesValue = other.BytesValue;
-      }
-      if (other.ProtoType != 0) {
-        ProtoType = other.ProtoType;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 8: {
-            dataType_ = (global::Tango.PMR.DataStore.DataType) input.ReadEnum();
-            break;
-          }
-          case 16: {
-            Int32Value = input.ReadInt32();
-            break;
-          }
-          case 29: {
-            FloatValue = input.ReadFloat();
-            break;
-          }
-          case 33: {
-            DoubleValue = input.ReadDouble();
-            break;
-          }
-          case 40: {
-            BooleanValue = input.ReadBool();
-            break;
-          }
-          case 50: {
-            StringValue = input.ReadString();
-            break;
-          }
-          case 58: {
-            BytesValue = input.ReadBytes();
-            break;
-          }
-          case 160: {
-            protoType_ = (global::Tango.PMR.Common.MessageType) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItemModifiedRequest.cs b/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItemModifiedRequest.cs
deleted file mode 100644
index c4a8163fd..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItemModifiedRequest.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: DataStoreItemModifiedRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from DataStoreItemModifiedRequest.proto</summary>
-  public static partial class DataStoreItemModifiedRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for DataStoreItemModifiedRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static DataStoreItemModifiedRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiJEYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXF1ZXN0LnByb3RvEhNUYW5nby5Q",
-            "TVIuRGF0YVN0b3JlIj8KHERhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QS",
-            "EgoKQ29sbGVjdGlvbhgBIAEoCRILCgNLZXkYAiABKAlCHwodY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5kYXRhc3RvcmViBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.DataStoreItemModifiedRequest), global::Tango.PMR.DataStore.DataStoreItemModifiedRequest.Parser, new[]{ "Collection", "Key" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class DataStoreItemModifiedRequest : pb::IMessage<DataStoreItemModifiedRequest> {
-    private static readonly pb::MessageParser<DataStoreItemModifiedRequest> _parser = new pb::MessageParser<DataStoreItemModifiedRequest>(() => new DataStoreItemModifiedRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<DataStoreItemModifiedRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.DataStoreItemModifiedRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItemModifiedRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItemModifiedRequest(DataStoreItemModifiedRequest other) : this() {
-      collection_ = other.collection_;
-      key_ = other.key_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItemModifiedRequest Clone() {
-      return new DataStoreItemModifiedRequest(this);
-    }
-
-    /// <summary>Field number for the "Collection" field.</summary>
-    public const int CollectionFieldNumber = 1;
-    private string collection_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Collection {
-      get { return collection_; }
-      set {
-        collection_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Key" field.</summary>
-    public const int KeyFieldNumber = 2;
-    private string key_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Key {
-      get { return key_; }
-      set {
-        key_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as DataStoreItemModifiedRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(DataStoreItemModifiedRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Collection != other.Collection) return false;
-      if (Key != other.Key) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Collection.Length != 0) hash ^= Collection.GetHashCode();
-      if (Key.Length != 0) hash ^= Key.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Collection.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Collection);
-      }
-      if (Key.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Key);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Collection.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Collection);
-      }
-      if (Key.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(DataStoreItemModifiedRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Collection.Length != 0) {
-        Collection = other.Collection;
-      }
-      if (other.Key.Length != 0) {
-        Key = other.Key;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Collection = input.ReadString();
-            break;
-          }
-          case 18: {
-            Key = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItemModifiedResponse.cs b/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItemModifiedResponse.cs
deleted file mode 100644
index fc70186aa..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/DataStoreItemModifiedResponse.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: DataStoreItemModifiedResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from DataStoreItemModifiedResponse.proto</summary>
-  public static partial class DataStoreItemModifiedResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for DataStoreItemModifiedResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static DataStoreItemModifiedResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiNEYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXNwb25zZS5wcm90bxITVGFuZ28u",
-            "UE1SLkRhdGFTdG9yZSIfCh1EYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXNwb25z",
-            "ZUIfCh1jb20udHdpbmUudGFuZ28ucG1yLmRhdGFzdG9yZWIGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.DataStoreItemModifiedResponse), global::Tango.PMR.DataStore.DataStoreItemModifiedResponse.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class DataStoreItemModifiedResponse : pb::IMessage<DataStoreItemModifiedResponse> {
-    private static readonly pb::MessageParser<DataStoreItemModifiedResponse> _parser = new pb::MessageParser<DataStoreItemModifiedResponse>(() => new DataStoreItemModifiedResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<DataStoreItemModifiedResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.DataStoreItemModifiedResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItemModifiedResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItemModifiedResponse(DataStoreItemModifiedResponse other) : this() {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public DataStoreItemModifiedResponse Clone() {
-      return new DataStoreItemModifiedResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as DataStoreItemModifiedResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(DataStoreItemModifiedResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(DataStoreItemModifiedResponse other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/DataType.cs b/Software/Visual_Studio/Tango.PMR/DataStore/DataType.cs
deleted file mode 100644
index 3ec396931..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/DataType.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: DataType.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from DataType.proto</summary>
-  public static partial class DataTypeReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for DataType.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static DataTypeReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cg5EYXRhVHlwZS5wcm90bxITVGFuZ28uUE1SLkRhdGFTdG9yZSpbCghEYXRh",
-            "VHlwZRIJCgVJbnQzMhAAEgkKBUZsb2F0EAESCgoGRG91YmxlEAISCwoHQm9v",
-            "bGVhbhADEgoKBlN0cmluZxAEEgkKBUJ5dGVzEAUSCQoFUHJvdG8QBkIfCh1j",
-            "b20udHdpbmUudGFuZ28ucG1yLmRhdGFzdG9yZWIGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.DataStore.DataType), }, null));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum DataType {
-    [pbr::OriginalName("Int32")] Int32 = 0,
-    [pbr::OriginalName("Float")] Float = 1,
-    [pbr::OriginalName("Double")] Double = 2,
-    [pbr::OriginalName("Boolean")] Boolean = 3,
-    [pbr::OriginalName("String")] String = 4,
-    [pbr::OriginalName("Bytes")] Bytes = 5,
-    [pbr::OriginalName("Proto")] Proto = 6,
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/GetDataStoreItemRequest.cs b/Software/Visual_Studio/Tango.PMR/DataStore/GetDataStoreItemRequest.cs
deleted file mode 100644
index a4bb5332b..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/GetDataStoreItemRequest.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: GetDataStoreItemRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from GetDataStoreItemRequest.proto</summary>
-  public static partial class GetDataStoreItemRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for GetDataStoreItemRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static GetDataStoreItemRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch1HZXREYXRhU3RvcmVJdGVtUmVxdWVzdC5wcm90bxITVGFuZ28uUE1SLkRh",
-            "dGFTdG9yZRoTRGF0YVN0b3JlSXRlbS5wcm90byJzChdHZXREYXRhU3RvcmVJ",
-            "dGVtUmVxdWVzdBISCgpDb2xsZWN0aW9uGAEgASgJEgsKA0tleRgCIAEoCRI3",
-            "CgtEZWZhdWx0SXRlbRgDIAEoCzIiLlRhbmdvLlBNUi5EYXRhU3RvcmUuRGF0",
-            "YVN0b3JlSXRlbUIfCh1jb20udHdpbmUudGFuZ28ucG1yLmRhdGFzdG9yZWIG",
-            "cHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.DataStore.DataStoreItemReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.GetDataStoreItemRequest), global::Tango.PMR.DataStore.GetDataStoreItemRequest.Parser, new[]{ "Collection", "Key", "DefaultItem" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class GetDataStoreItemRequest : pb::IMessage<GetDataStoreItemRequest> {
-    private static readonly pb::MessageParser<GetDataStoreItemRequest> _parser = new pb::MessageParser<GetDataStoreItemRequest>(() => new GetDataStoreItemRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetDataStoreItemRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.GetDataStoreItemRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetDataStoreItemRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetDataStoreItemRequest(GetDataStoreItemRequest other) : this() {
-      collection_ = other.collection_;
-      key_ = other.key_;
-      DefaultItem = other.defaultItem_ != null ? other.DefaultItem.Clone() : null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetDataStoreItemRequest Clone() {
-      return new GetDataStoreItemRequest(this);
-    }
-
-    /// <summary>Field number for the "Collection" field.</summary>
-    public const int CollectionFieldNumber = 1;
-    private string collection_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Collection {
-      get { return collection_; }
-      set {
-        collection_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Key" field.</summary>
-    public const int KeyFieldNumber = 2;
-    private string key_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Key {
-      get { return key_; }
-      set {
-        key_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "DefaultItem" field.</summary>
-    public const int DefaultItemFieldNumber = 3;
-    private global::Tango.PMR.DataStore.DataStoreItem defaultItem_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.DataStore.DataStoreItem DefaultItem {
-      get { return defaultItem_; }
-      set {
-        defaultItem_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetDataStoreItemRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetDataStoreItemRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Collection != other.Collection) return false;
-      if (Key != other.Key) return false;
-      if (!object.Equals(DefaultItem, other.DefaultItem)) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Collection.Length != 0) hash ^= Collection.GetHashCode();
-      if (Key.Length != 0) hash ^= Key.GetHashCode();
-      if (defaultItem_ != null) hash ^= DefaultItem.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Collection.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Collection);
-      }
-      if (Key.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Key);
-      }
-      if (defaultItem_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DefaultItem);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Collection.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Collection);
-      }
-      if (Key.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
-      }
-      if (defaultItem_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(DefaultItem);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetDataStoreItemRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Collection.Length != 0) {
-        Collection = other.Collection;
-      }
-      if (other.Key.Length != 0) {
-        Key = other.Key;
-      }
-      if (other.defaultItem_ != null) {
-        if (defaultItem_ == null) {
-          defaultItem_ = new global::Tango.PMR.DataStore.DataStoreItem();
-        }
-        DefaultItem.MergeFrom(other.DefaultItem);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Collection = input.ReadString();
-            break;
-          }
-          case 18: {
-            Key = input.ReadString();
-            break;
-          }
-          case 26: {
-            if (defaultItem_ == null) {
-              defaultItem_ = new global::Tango.PMR.DataStore.DataStoreItem();
-            }
-            input.ReadMessage(defaultItem_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/GetDataStoreItemResponse.cs b/Software/Visual_Studio/Tango.PMR/DataStore/GetDataStoreItemResponse.cs
deleted file mode 100644
index a42d22d23..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/GetDataStoreItemResponse.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: GetDataStoreItemResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from GetDataStoreItemResponse.proto</summary>
-  public static partial class GetDataStoreItemResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for GetDataStoreItemResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static GetDataStoreItemResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch5HZXREYXRhU3RvcmVJdGVtUmVzcG9uc2UucHJvdG8SE1RhbmdvLlBNUi5E",
-            "YXRhU3RvcmUaE0RhdGFTdG9yZUl0ZW0ucHJvdG8iWQoYR2V0RGF0YVN0b3Jl",
-            "SXRlbVJlc3BvbnNlEgsKA0tleRgBIAEoCRIwCgRJdGVtGAIgASgLMiIuVGFu",
-            "Z28uUE1SLkRhdGFTdG9yZS5EYXRhU3RvcmVJdGVtQh8KHWNvbS50d2luZS50",
-            "YW5nby5wbXIuZGF0YXN0b3JlYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.DataStore.DataStoreItemReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.GetDataStoreItemResponse), global::Tango.PMR.DataStore.GetDataStoreItemResponse.Parser, new[]{ "Key", "Item" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class GetDataStoreItemResponse : pb::IMessage<GetDataStoreItemResponse> {
-    private static readonly pb::MessageParser<GetDataStoreItemResponse> _parser = new pb::MessageParser<GetDataStoreItemResponse>(() => new GetDataStoreItemResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetDataStoreItemResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.GetDataStoreItemResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetDataStoreItemResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetDataStoreItemResponse(GetDataStoreItemResponse other) : this() {
-      key_ = other.key_;
-      Item = other.item_ != null ? other.Item.Clone() : null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetDataStoreItemResponse Clone() {
-      return new GetDataStoreItemResponse(this);
-    }
-
-    /// <summary>Field number for the "Key" field.</summary>
-    public const int KeyFieldNumber = 1;
-    private string key_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Key {
-      get { return key_; }
-      set {
-        key_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Item" field.</summary>
-    public const int ItemFieldNumber = 2;
-    private global::Tango.PMR.DataStore.DataStoreItem item_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.DataStore.DataStoreItem Item {
-      get { return item_; }
-      set {
-        item_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetDataStoreItemResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetDataStoreItemResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Key != other.Key) return false;
-      if (!object.Equals(Item, other.Item)) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Key.Length != 0) hash ^= Key.GetHashCode();
-      if (item_ != null) hash ^= Item.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Key.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Key);
-      }
-      if (item_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Item);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Key.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
-      }
-      if (item_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Item);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetDataStoreItemResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Key.Length != 0) {
-        Key = other.Key;
-      }
-      if (other.item_ != null) {
-        if (item_ == null) {
-          item_ = new global::Tango.PMR.DataStore.DataStoreItem();
-        }
-        Item.MergeFrom(other.Item);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Key = input.ReadString();
-            break;
-          }
-          case 18: {
-            if (item_ == null) {
-              item_ = new global::Tango.PMR.DataStore.DataStoreItem();
-            }
-            input.ReadMessage(item_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/PutDataStoreItemRequest.cs b/Software/Visual_Studio/Tango.PMR/DataStore/PutDataStoreItemRequest.cs
deleted file mode 100644
index 9e9be6768..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/PutDataStoreItemRequest.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: PutDataStoreItemRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from PutDataStoreItemRequest.proto</summary>
-  public static partial class PutDataStoreItemRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for PutDataStoreItemRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static PutDataStoreItemRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch1QdXREYXRhU3RvcmVJdGVtUmVxdWVzdC5wcm90bxITVGFuZ28uUE1SLkRh",
-            "dGFTdG9yZRoTRGF0YVN0b3JlSXRlbS5wcm90byJsChdQdXREYXRhU3RvcmVJ",
-            "dGVtUmVxdWVzdBISCgpDb2xsZWN0aW9uGAEgASgJEgsKA0tleRgCIAEoCRIw",
-            "CgRJdGVtGAMgASgLMiIuVGFuZ28uUE1SLkRhdGFTdG9yZS5EYXRhU3RvcmVJ",
-            "dGVtQh8KHWNvbS50d2luZS50YW5nby5wbXIuZGF0YXN0b3JlYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.DataStore.DataStoreItemReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.PutDataStoreItemRequest), global::Tango.PMR.DataStore.PutDataStoreItemRequest.Parser, new[]{ "Collection", "Key", "Item" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class PutDataStoreItemRequest : pb::IMessage<PutDataStoreItemRequest> {
-    private static readonly pb::MessageParser<PutDataStoreItemRequest> _parser = new pb::MessageParser<PutDataStoreItemRequest>(() => new PutDataStoreItemRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<PutDataStoreItemRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.PutDataStoreItemRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PutDataStoreItemRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PutDataStoreItemRequest(PutDataStoreItemRequest other) : this() {
-      collection_ = other.collection_;
-      key_ = other.key_;
-      Item = other.item_ != null ? other.Item.Clone() : null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PutDataStoreItemRequest Clone() {
-      return new PutDataStoreItemRequest(this);
-    }
-
-    /// <summary>Field number for the "Collection" field.</summary>
-    public const int CollectionFieldNumber = 1;
-    private string collection_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Collection {
-      get { return collection_; }
-      set {
-        collection_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Key" field.</summary>
-    public const int KeyFieldNumber = 2;
-    private string key_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Key {
-      get { return key_; }
-      set {
-        key_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "Item" field.</summary>
-    public const int ItemFieldNumber = 3;
-    private global::Tango.PMR.DataStore.DataStoreItem item_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.DataStore.DataStoreItem Item {
-      get { return item_; }
-      set {
-        item_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as PutDataStoreItemRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(PutDataStoreItemRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Collection != other.Collection) return false;
-      if (Key != other.Key) return false;
-      if (!object.Equals(Item, other.Item)) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Collection.Length != 0) hash ^= Collection.GetHashCode();
-      if (Key.Length != 0) hash ^= Key.GetHashCode();
-      if (item_ != null) hash ^= Item.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Collection.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Collection);
-      }
-      if (Key.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Key);
-      }
-      if (item_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Item);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Collection.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Collection);
-      }
-      if (Key.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Key);
-      }
-      if (item_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Item);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(PutDataStoreItemRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Collection.Length != 0) {
-        Collection = other.Collection;
-      }
-      if (other.Key.Length != 0) {
-        Key = other.Key;
-      }
-      if (other.item_ != null) {
-        if (item_ == null) {
-          item_ = new global::Tango.PMR.DataStore.DataStoreItem();
-        }
-        Item.MergeFrom(other.Item);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Collection = input.ReadString();
-            break;
-          }
-          case 18: {
-            Key = input.ReadString();
-            break;
-          }
-          case 26: {
-            if (item_ == null) {
-              item_ = new global::Tango.PMR.DataStore.DataStoreItem();
-            }
-            input.ReadMessage(item_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/DataStore/PutDataStoreItemResponse.cs b/Software/Visual_Studio/Tango.PMR/DataStore/PutDataStoreItemResponse.cs
deleted file mode 100644
index bd798cedf..000000000
--- a/Software/Visual_Studio/Tango.PMR/DataStore/PutDataStoreItemResponse.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: PutDataStoreItemResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.DataStore {
-
-  /// <summary>Holder for reflection information generated from PutDataStoreItemResponse.proto</summary>
-  public static partial class PutDataStoreItemResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for PutDataStoreItemResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static PutDataStoreItemResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch5QdXREYXRhU3RvcmVJdGVtUmVzcG9uc2UucHJvdG8SE1RhbmdvLlBNUi5E",
-            "YXRhU3RvcmUiGgoYUHV0RGF0YVN0b3JlSXRlbVJlc3BvbnNlQh8KHWNvbS50",
-            "d2luZS50YW5nby5wbXIuZGF0YXN0b3JlYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.DataStore.PutDataStoreItemResponse), global::Tango.PMR.DataStore.PutDataStoreItemResponse.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class PutDataStoreItemResponse : pb::IMessage<PutDataStoreItemResponse> {
-    private static readonly pb::MessageParser<PutDataStoreItemResponse> _parser = new pb::MessageParser<PutDataStoreItemResponse>(() => new PutDataStoreItemResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<PutDataStoreItemResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.DataStore.PutDataStoreItemResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PutDataStoreItemResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PutDataStoreItemResponse(PutDataStoreItemResponse other) : this() {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public PutDataStoreItemResponse Clone() {
-      return new PutDataStoreItemResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as PutDataStoreItemResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(PutDataStoreItemResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(PutDataStoreItemResponse other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code