diff --git a/Controls/DatePickerSetupControl.php b/Controls/DatePickerSetupControl.php
index a5a22b9ee..d788990cb 100644
--- a/Controls/DatePickerSetupControl.php
+++ b/Controls/DatePickerSetupControl.php
@@ -43,11 +43,7 @@ public function PageLoad()
         $this->SetDefault('MinDate', null);
         $this->SetDefault('MaxDate', null);
 
-        if ($controlId == 'datepicker') {
-            $this->Display('Controls/DatePickerSetup.tpl');
-        } else {
-            $this->Display('Controls/DateSetup.tpl');
-        }
+        $this->Display('Controls/DateSetup.tpl');
     }
 
     private function SetDefault($key, $value)
diff --git a/tpl/Controls/DatePickerSetup.tpl b/tpl/Controls/DatePickerSetup.tpl
deleted file mode 100644
index faefcaadf..000000000
--- a/tpl/Controls/DatePickerSetup.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-{function name=datePickerDateFormat}
-new Date({$date->Year()}, {$date->Month()-1}, {$date->Day()})
-{/function}
-<script type="text/javascript">
-    $(function () {
-        $("#{$ControlId}").{if $HasTimepicker}datetimepicker{else}datepicker{/if}({ldelim}
-            numberOfMonths: {$NumberOfMonths},
-            showButtonPanel: {$ShowButtonPanel},
-            onSelect: {$OnSelect},
-            dayNames: {$DayNames},
-            dayNamesShort: {$DayNamesShort},
-            dayNamesMin: {$DayNamesMin},
-            dateFormat: '{$DateFormat}',
-            {if $FirstDay >=0 && $FirstDay <= 6}
-            firstDay: {$FirstDay},
-            {/if}
-            monthNames: {$MonthNames},
-            monthNamesShort: {$MonthNamesShort},
-            currentText: "{{translate key='Today'}|escape:'javascript'}",
-            timeFormat: "{$TimeFormat}",
-            altFieldTimeOnly: false,
-            showWeek: {if $ShowWeekNumbers}true{else}false{/if},
-            controlType: 'select'
-            {if $AltId neq ''}
-            ,
-            altField: "#{$AltId}",
-            altFormat: '{$AltFormat}'
-            {/if}
-            {if $DefaultDate}
-            ,
-            defaultDate: {datePickerDateFormat date=$DefaultDate}
-            {/if}
-            {if $MinDate}
-            ,
-            minDate: {datePickerDateFormat date=$MinDate}
-            {/if}
-            {if $MaxDate}
-            ,
-            maxDate: {datePickerDateFormat date=$MaxDate->AddDays(1)}
-            {/if}
-            {rdelim});
-
-        {if $AltId neq ''}
-        $("#{$ControlId}").change(function () {
-            if ($(this).val() == '') {
-                $("#{$AltId}").val('');
-            }
-            else {
-                var dateVal = $("#{$ControlId}").{if $HasTimepicker}datetimepicker{else}datepicker{/if}('getDate');
-                var dateString = dateVal.getFullYear() + '-' + ('0' + (dateVal.getMonth() + 1)).slice(-2) + '-' + ('0' + dateVal.getDate()).slice(-2);
-                {if $HasTimepicker}
-                dateString = dateString + ' ' + dateVal.getHours() + ':' + dateVal.getMinutes();
-                {/if}
-                $("#{$AltId}").val(dateString);
-            }
-        });
-        {/if}
-
-    });
-</script>
diff --git a/tpl/Controls/DateSetup.tpl b/tpl/Controls/DateSetup.tpl
index e9311a258..670cbe27e 100644
--- a/tpl/Controls/DateSetup.tpl
+++ b/tpl/Controls/DateSetup.tpl
@@ -1,23 +1,20 @@
-{function name=dateFormat}
-    new Date({$date->Year()}, {$date->Month()-1}, {$date->Day()}).toISOString().split('T')[0]
-{/function}
 <script type="text/javascript">
     $(function() {
         let $controlId = $("#{$ControlId}");
         let $altId = $("#{$AltId}");
 
         {if $MinDate}
-            var minDate = {dateFormat date=$MinDate};
+            var minDate = "{$MinDate->format('Y-m-d')}"
             $controlId.attr('min', minDate);
         {/if}
 
         {if $MaxDate}
-            var maxDate = {dateFormat date=$MaxDate->AddDays(1)};
+            var maxDate = "{$MaxDate->AddDays(1)->format('Y-m-d')}"
             $controlId.attr('max', maxDate);
         {/if}
 
         {if $DefaultDate}
-            var defaultDate = {dateFormat date=$DefaultDate};
+            var defaultDate = "{$DefaultDate->format('Y-m-d')}";
             $controlId.val(defaultDate);
 
         {/if}
@@ -25,25 +22,8 @@
         {if $AltId neq ''}
             $controlId.on('change', function() {
                 var dateVal = $controlId.val();
-
-                if (dateVal === '') {
-                    $altId.val('');
-                } else {
-                    var date = new Date(dateVal);
-                    var dateString = date.toISOString().split('T')[0];
-
-                    {if $HasTimepicker}
-                        var time = dateVal.split('T')[1];
-                        if (time) {
-                            dateString += ' ' + time.split('.')[0];
-                        }
-                    {/if}
-
-                    $altId.val(dateString);
-                }
+                $altId.val(dateVal);
             });
         {/if}
-
-
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/tpl/Reservation/create.tpl b/tpl/Reservation/create.tpl
index 2de5e7fb0..49f85c6cb 100755
--- a/tpl/Reservation/create.tpl
+++ b/tpl/Reservation/create.tpl
@@ -532,7 +532,6 @@
 {control type="DatePickerSetupControl" ControlId="EndRepeat" AltId="formattedEndRepeat" DefaultDate=$RepeatTerminationDate MinDate=$StartDate MaxDate=$AvailabilityEnd FirstDay=$FirstWeekday}
 {control type="DatePickerSetupControl" ControlId="RepeatDate" AltId="formattedRepeatDate" MaxDate=$AvailabilityEnd FirstDay=$FirstWeekday MinDate=Date::Now()->ToTimezone($Timezone)}
 
-{jsfile src="js/jquery.autogrow.js"}
 {jsfile src="js/moment.min.js"}
 {jsfile src="resourcePopup.js"}
 {jsfile src="userPopup.js"}
@@ -643,7 +642,6 @@
             return false;
         });
 
-        $('#description').autogrow();
         $('#userName').bindUserDetails();
 
         // jsPDF
@@ -680,4 +678,4 @@
         }
     </script>
 
-    {include file='globalfooter.tpl'}
\ No newline at end of file
+    {include file='globalfooter.tpl'}
diff --git a/tpl/Reservation/view.tpl b/tpl/Reservation/view.tpl
index c7d58f3bf..dc221f354 100644
--- a/tpl/Reservation/view.tpl
+++ b/tpl/Reservation/view.tpl
@@ -369,7 +369,6 @@
 {include file="javascript-includes.tpl"}
 {jsfile src="participation.js"}
 {jsfile src="approval.js"}
-{jsfile src="js/jquery.autogrow.js"}
 {jsfile src="resourcePopup.js"}
 {jsfile src="userPopup.js"}
 {jsfile src="date-helper.js"}
@@ -437,4 +436,4 @@
         //
     });
 </script>
-{include file='globalfooter.tpl'}
\ No newline at end of file
+{include file='globalfooter.tpl'}