diff --git a/dist/js/bootstrap-hijri-datetimepicker.js b/dist/js/bootstrap-hijri-datetimepicker.js
index c1d45c4..3e8684d 100644
--- a/dist/js/bootstrap-hijri-datetimepicker.js
+++ b/dist/js/bootstrap-hijri-datetimepicker.js
@@ -13839,7 +13839,7 @@
             ///<summary>Destroys the widget and removes all attached event listeners</summary>
             hide();
             detachDatePickerElementEvents();
-            element.removeData('DateTimePicker');
+            element.removeData('HijriDatePicker');
             element.removeData('date');
         };
 
diff --git a/samples/index.html b/samples/index.html
index f8c1ee3..2278f17 100644
--- a/samples/index.html
+++ b/samples/index.html
@@ -27,35 +27,12 @@ <h2>Bootstrap Hijri Date Picker v1.0.0</h2>
 
         <div class="row">
             <div class="col-md-6">
-                <div class="card">
-                    <div class="card-body">
-                        <div class="form-group">
-                            <label>
-                                Date
-                            </label>
-                            <div class="input-group">
-                                <input type="text" class="form-control default-input" />
-                            </div>
-                        </div>
-                        <figure class="highlight">
-                            <pre><code class="language-html" data-lang="html"><span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">"card"</span><span class="nt">&gt;</span>
-                            <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">"card-body"</span><span class="nt">&gt;</span>
-                              This is some text within a card body.
-                            <span class="nt">&lt;/div&gt;</span>
-                          <span class="nt">&lt;/div&gt;</span></code></pre>
-                        </figure>
-                    </div>
-                </div>
 
-            </div>
-            <div class="col-md-6">
                 <div class="form-group">
                     <label>
-                        Date
+                        Default Hijir
                     </label>
-                    <div class="input-group">
-                        <input type="text" class="form-control hijri-date-input" />
-                    </div>
+                    <input id="hijri-picker" type="text" class="form-control" />
                 </div>
             </div>
         </div>
@@ -64,7 +41,7 @@ <h2>Bootstrap Hijri Date Picker v1.0.0</h2>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/moment.min.js"></script>
     <script src="./js/bootstrap-hijri-datetimepickermin.js"></script>
-    
+
     <script type="text/javascript">
 
 
@@ -72,43 +49,13 @@ <h2>Bootstrap Hijri Date Picker v1.0.0</h2>
 
             initDefault();
 
-            initHijrDatePicker();
-
-            //initHijrDatePickerDefault();
-
         });
 
-        function initHijrDatePicker() {
-
-            $(".hijri-date-input").hijriDatePicker({
-                locale: "ar-sa",
-                format: "DD-MM-YYYY",
-                hijriFormat: "iYYYY-iMM-iDD",
-                dayViewHeaderFormat: "MMMM YYYY",
-                hijriDayViewHeaderFormat: "iMMMM iYYYY",
-                showSwitcher: true,
-                allowInputToggle: true,
-                showTodayButton: false,
-                useCurrent: true,
-                isRTL: true,
-                viewMode: 'months',
-                keepOpen: false,
-                hijri: true,
-                //debug: true,
-                showClear: true,
-                showTodayButton: true,
-                showClose: true
-            });
-        }
-
-        function initHijrDatePickerDefault() {
-
-            $(".hijri-date-input").hijriDatePicker();
-        }
-
-
         function initDefault() {
-            $(".default-input").hijriDatePicker();
+            $("#hijri-picker").hijriDatePicker({
+                hijri:true,
+                showSwitcher:false
+            });
         }
 
     </script>
diff --git a/src/js/bootstrap-hijri-datetimepicker.js b/src/js/bootstrap-hijri-datetimepicker.js
index 8301af2..8a55c64 100644
--- a/src/js/bootstrap-hijri-datetimepicker.js
+++ b/src/js/bootstrap-hijri-datetimepicker.js
@@ -1729,7 +1729,7 @@
             ///<summary>Destroys the widget and removes all attached event listeners</summary>
             hide();
             detachDatePickerElementEvents();
-            element.removeData('DateTimePicker');
+            element.removeData('HijriDatePicker');
             element.removeData('date');
         };
 
@@ -2766,7 +2766,7 @@
         maxDate: '2070-01-01',
         extraFormats: false,
         stepping: 1,
-        useCurrent: true,
+        useCurrent: false,
         collapse: true,
         locale: 'ar-SA',
         defaultDate: false,