diff --git a/.gitignore b/.gitignore
index f796589bc..791d9a970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ nbproject
 build.xml
 .DS_Store
 /_lib
-/gradlew_release.cmd
\ No newline at end of file
+/gradlew_release.cmd
+/gradle_localOverride.cmd
diff --git a/gradlew_build.cmd b/gradlew_build.cmd
index e3a4e3beb..5592276dd 100644
--- a/gradlew_build.cmd
+++ b/gradlew_build.cmd
@@ -1,2 +1,4 @@
+@echo off
+IF EXIST "gradle_localOverride.cmd" call "gradle_localOverride.cmd"
 call gradlew build
 pause
\ No newline at end of file
diff --git a/gradlew_lib.cmd b/gradlew_lib.cmd
index cc5c40663..e347c9472 100644
--- a/gradlew_lib.cmd
+++ b/gradlew_lib.cmd
@@ -1,2 +1,4 @@
+@echo off
+IF EXIST "gradle_localOverride.cmd" call "gradle_localOverride.cmd"
 call gradlew copyToLib
 pause
\ No newline at end of file
diff --git a/src/main/java/jfxtras/labs/scene/control/CalendarPicker.java b/src/main/java/jfxtras/labs/scene/control/CalendarPicker.java
index 01ba910a4..db451aa90 100644
--- a/src/main/java/jfxtras/labs/scene/control/CalendarPicker.java
+++ b/src/main/java/jfxtras/labs/scene/control/CalendarPicker.java
@@ -31,8 +31,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import sun.util.calendar.CalendarUtils;
-
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;