diff --git a/src/components/Blazor/CalendarDate.cs b/src/components/Blazor/CalendarDate.cs
deleted file mode 100644
index 007dbe58..00000000
--- a/src/components/Blazor/CalendarDate.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using Microsoft.AspNetCore.Components;
-
-namespace IgniteUI.Blazor.Controls
-{
-    public partial class IgbCalendarDate : BaseRendererElement
-    {
-        public override string Type { get { return "CalendarDate"; } }
-
-        private static bool _marshalByValue = true;
-
-        public IgbCalendarDate() : base()
-        {
-            OnCreatedIgbCalendarDate();
-
-        }
-
-        partial void OnCreatedIgbCalendarDate();
-
-        private DateTime _date = DateTime.MinValue;
-
-        partial void OnDateChanging(ref DateTime newValue);
-        [Parameter]
-        public DateTime Date
-        {
-            get { return this._date; }
-            set
-            {
-                if (this._date != value || !IsPropDirty("Date"))
-                {
-                    MarkPropDirty("Date");
-                }
-                this._date = value;
-
-            }
-        }
-        private bool _isCurrentMonth = false;
-
-        partial void OnIsCurrentMonthChanging(ref bool newValue);
-        [Parameter]
-        public bool IsCurrentMonth
-        {
-            get { return this._isCurrentMonth; }
-            set
-            {
-                if (this._isCurrentMonth != value || !IsPropDirty("IsCurrentMonth"))
-                {
-                    MarkPropDirty("IsCurrentMonth");
-                }
-                this._isCurrentMonth = value;
-
-            }
-        }
-        private bool _isPrevMonth = false;
-
-        partial void OnIsPrevMonthChanging(ref bool newValue);
-        [Parameter]
-        public bool IsPrevMonth
-        {
-            get { return this._isPrevMonth; }
-            set
-            {
-                if (this._isPrevMonth != value || !IsPropDirty("IsPrevMonth"))
-                {
-                    MarkPropDirty("IsPrevMonth");
-                }
-                this._isPrevMonth = value;
-
-            }
-        }
-        private bool _isNextMonth = false;
-
-        partial void OnIsNextMonthChanging(ref bool newValue);
-        [Parameter]
-        public bool IsNextMonth
-        {
-            get { return this._isNextMonth; }
-            set
-            {
-                if (this._isNextMonth != value || !IsPropDirty("IsNextMonth"))
-                {
-                    MarkPropDirty("IsNextMonth");
-                }
-                this._isNextMonth = value;
-
-            }
-        }
-
-        partial void FindByNameCalendarDate(string name, ref object item);
-        public override object FindByName(string name)
-        {
-
-            var baseResult = base.FindByName(name);
-            if (baseResult != null)
-            {
-                return baseResult;
-            }
-
-            object item = null;
-            FindByNameCalendarDate(name, ref item);
-            if (item != null)
-            {
-                return item;
-            }
-
-            return null;
-        }
-
-        partial void SerializeCoreIgbCalendarDate(RendererSerializer ser);
-
-        internal override void SerializeCore(RendererSerializer ser)
-        {
-            base.SerializeCore(ser);
-
-            SerializeCoreIgbCalendarDate(ser);
-
-            if (IsPropDirty("Date"))
-            { ser.AddDateTimeProp("date", this._date); }
-            if (IsPropDirty("IsCurrentMonth"))
-            { ser.AddBooleanProp("isCurrentMonth", this._isCurrentMonth); }
-            if (IsPropDirty("IsPrevMonth"))
-            { ser.AddBooleanProp("isPrevMonth", this._isPrevMonth); }
-            if (IsPropDirty("IsNextMonth"))
-            { ser.AddBooleanProp("isNextMonth", this._isNextMonth); }
-
-        }
-
-        protected internal override void ToEventJson(BaseRendererControl control, Dictionary<string, object> args)
-        {
-            base.ToEventJson(control, args);
-
-            if (IsPropDirty("Date"))
-            { args["date"] = DateToString(this._date); }
-            if (IsPropDirty("IsCurrentMonth"))
-            { args["isCurrentMonth"] = (this._isCurrentMonth).ToString().ToLower(); }
-            if (IsPropDirty("IsPrevMonth"))
-            { args["isPrevMonth"] = (this._isPrevMonth).ToString().ToLower(); }
-            if (IsPropDirty("IsNextMonth"))
-            { args["isNextMonth"] = (this._isNextMonth).ToString().ToLower(); }
-
-        }
-
-        protected internal override void FromEventJson(BaseRendererControl control, Dictionary<string, object> args)
-        {
-            base.FromEventJson(control, args);
-            this.SuppressParentNotify = true;
-
-            if (args.ContainsKey("date"))
-            { this.Date = ReturnToDate(args["date"]); }
-            if (args.ContainsKey("isCurrentMonth"))
-            { this.IsCurrentMonth = ReturnToBoolean(args["isCurrentMonth"]); }
-            if (args.ContainsKey("isPrevMonth"))
-            { this.IsPrevMonth = ReturnToBoolean(args["isPrevMonth"]); }
-            if (args.ContainsKey("isNextMonth"))
-            { this.IsNextMonth = ReturnToBoolean(args["isNextMonth"]); }
-
-            this.SuppressParentNotify = false;
-        }
-
-    }
-}
diff --git a/src/components/Blazor/CalendarDateEventArgs.cs b/src/components/Blazor/CalendarDateEventArgs.cs
deleted file mode 100644
index 0f3186cf..00000000
--- a/src/components/Blazor/CalendarDateEventArgs.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Microsoft.AspNetCore.Components;
-
-namespace IgniteUI.Blazor.Controls
-{
-    public partial class IgbCalendarDateEventArgs : BaseRendererElement
-    {
-        public override string Type { get { return "WebCalendarDateEventArgs"; } }
-
-        public IgbCalendarDateEventArgs() : base()
-        {
-            OnCreatedIgbCalendarDateEventArgs();
-
-        }
-
-        partial void OnCreatedIgbCalendarDateEventArgs();
-
-        private IgbCalendarDate _detail;
-
-        partial void OnDetailChanging(ref IgbCalendarDate newValue);
-        [Parameter]
-        public IgbCalendarDate Detail
-        {
-            get { return this._detail; }
-            set
-            {
-                OnDetailChanging(ref value);
-                MarkPropDirty("Detail");
-                if (this._detail != null)
-                {
-                    this.DetachChild(this._detail);
-                }
-                if (value != null)
-                {
-                    this.AttachChild(value);
-                }
-                this._detail = value;
-            }
-
-        }
-
-        partial void FindByNameCalendarDateEventArgs(string name, ref object item);
-        public override object FindByName(string name)
-        {
-
-            var baseResult = base.FindByName(name);
-            if (baseResult != null)
-            {
-                return baseResult;
-            }
-
-            object item = null;
-            FindByNameCalendarDateEventArgs(name, ref item);
-            if (item != null)
-            {
-                return item;
-            }
-
-            return null;
-        }
-
-        partial void SerializeCoreIgbCalendarDateEventArgs(RendererSerializer ser);
-
-        internal override void SerializeCore(RendererSerializer ser)
-        {
-            base.SerializeCore(ser);
-
-            SerializeCoreIgbCalendarDateEventArgs(ser);
-
-            if (IsPropDirty("Detail"))
-            { ser.AddSerializableProp("detail", this._detail); }
-
-        }
-
-        protected internal override void ToEventJson(BaseRendererControl control, Dictionary<string, object> args)
-        {
-            base.ToEventJson(control, args);
-
-            if (IsPropDirty("Detail"))
-            { args["detail"] = ObjectToParam(this._detail); }
-
-        }
-
-        protected internal override void FromEventJson(BaseRendererControl control, Dictionary<string, object> args)
-        {
-            base.FromEventJson(control, args);
-            this.SuppressParentNotify = true;
-
-            if (args.ContainsKey("detail"))
-            { this.Detail = (IgbCalendarDate)ConvertReturnValue(args["detail"], "CalendarDate", true); }
-
-            this.SuppressParentNotify = false;
-        }
-
-    }
-}
diff --git a/src/componentsBase/MarshalByValueFactory.cs b/src/componentsBase/MarshalByValueFactory.cs
index 7f6a54aa..58f7aeee 100644
--- a/src/componentsBase/MarshalByValueFactory.cs
+++ b/src/componentsBase/MarshalByValueFactory.cs
@@ -7,8 +7,6 @@ internal static bool MustMarshalByValue(string typeName)
             switch (typeName)
             {
                 //@@MustMarshalByValue
-                case "CalendarDate":
-                    return true;
                 case "CalendarFormatOptions":
                     return true;
                 case "FocusOptions":
@@ -132,7 +130,7 @@ internal static bool MustMarshalByValue(string typeName)
                 case "WebTreeSelectionEventArgsDetail":
                     return true;
 
-                    //@@MustMarshalByValueEnd                
+                    //@@MustMarshalByValueEnd
             }
             return false;
         }
@@ -142,9 +140,6 @@ internal static object CreateInstance(string typeName)
             switch (typeName)
             {
                 //@@MarshalByValue
-                case "CalendarDate":
-                    return new IgbCalendarDate();
-                    break;
                 case "CalendarFormatOptions":
                     return new IgbCalendarFormatOptions();
                     break;
diff --git a/src/src/Loader.ts b/src/src/Loader.ts
index 1b7833eb..27cac12d 100644
--- a/src/src/Loader.ts
+++ b/src/src/Loader.ts
@@ -1159,7 +1159,6 @@ export class Loader {
     if (Loader.marshalByValueSet == null) {
       Loader.marshalByValueSet = new Set<string>();
       //@@MarshalByValue
-      Loader.marshalByValueSet.add('CalendarDate');
       Loader.marshalByValueSet.add('CalendarFormatOptions');
       Loader.marshalByValueSet.add('FocusOptions');
       Loader.marshalByValueSet.add('FormatSpecifier');