diff --git a/js/litepicker.js b/js/litepicker.js
index 7cd1626..3f207ab 100644
--- a/js/litepicker.js
+++ b/js/litepicker.js
@@ -10,7 +10,8 @@
         var startDate = null;
         var endDate = null;
 
-        if (typeof drupalSettings.date_range_picker !== 'undefined') {
+        if (typeof drupalSettings.date_range_picker !== 'undefined'
+          && typeof drupalSettings.date_range_picker[element.id] !== 'undefined') {
             if (typeof drupalSettings.date_range_picker[element.id].start !== 'undefined') {
                 startDate = new Date(drupalSettings.date_range_picker[element.id].start + ' 12:00');
             }
@@ -64,25 +65,18 @@
                 previousMonth: '<svg width="11" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M7.919 0l2.748 2.667L5.333 8l5.334 5.333L7.919 16 0 8z" fill-rule="nonzero"/></svg>',
                 nextMonth: '<svg width="11" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M2.748 16L0 13.333 5.333 8 0 2.667 2.748 0l7.919 8z" fill-rule="nonzero"/></svg>'
             }, tooltipText: { one: "day", other: "days" }, onShow: function () {
-                console.log("onShow callback")
             },
             onHide: function () {
-                console.log("onHide callback")
             },
             onSelect: function (e, t) {
                 startInput.val(formatDate(e));
                 endInput.val(formatDate(t));
-                console.log("onSelect callback e:", formatDate(e));
-                console.log("onSelect callback t:", formatDate(t));
             },
             onError: function (e) {
-                console.log("onError callback", e)
             },
             onChangeMonth: function (e, t) {
-                console.log("onChangeMonth callback", e, t)
             },
             onChangeYear: function (e) {
-                console.log("onChangeYear callback", e)
             }
         });
 
@@ -90,24 +84,15 @@
 
     Drupal.behaviors.datetime_range_picker = {
         attach: function (context) {
-            console.log('Moo.');
 
-            var $dateRangeWidgets = $(context).find('.field--type-daterange');
+            var $dateRangeWidgets = $(context).find('.field--type-daterange  .form-wrapper');
             $dateRangeWidgets.each(function() {
                 var $dateRangeWidget = $(this);
 
                 var startInput= $(this).find('.start input').first().first();
                 var endInput=$(this).find('.end input').first().first();
 
-                console.log('startInput');
-                console.log(startInput);
-                console.log('endInput');
-                console.log(endInput);
-
                 $dateRangeWidget.find('.litepicker-input').once('daterange-widget').each(function() {
-                    console.log('hallo');
-                    console.log(this.id);
-                    console.log($(this));
                     init(this, startInput, endInput);
                 });
             });