diff --git a/src/main/java/com/kosherjava/zmanim/package-info.kt b/src/main/java/com/kosherjava/zmanim/package-info.kt
index b0aea021..afcdd0ce 100644
--- a/src/main/java/com/kosherjava/zmanim/package-info.kt
+++ b/src/main/java/com/kosherjava/zmanim/package-info.kt
@@ -11,34 +11,8 @@
  */
 package com.kosherjava.zmanim
 
-import com.kosherjava.zmanim.util.ZmanimFormatter
-import java.util.TimeZone
-import java.lang.StringBuffer
-import com.kosherjava.zmanim.util.Zman
-import java.lang.IllegalArgumentException
-import com.kosherjava.zmanim.util.GeoLocation
-import java.lang.StringBuilder
-import java.lang.CloneNotSupportedException
 import com.kosherjava.zmanim.util.AstronomicalCalculator
-import java.util.Calendar
-import com.kosherjava.zmanim.util.NOAACalculator
-import java.text.SimpleDateFormat
-import java.text.DecimalFormat
-import java.text.DateFormat
-import java.util.Collections
-import com.kosherjava.zmanim.util.GeoLocationUtils
-import com.kosherjava.zmanim.util.SunTimesCalculator
-import com.kosherjava.zmanim.hebrewcalendar.Daf
-import com.kosherjava.zmanim.hebrewcalendar.JewishDate
-import java.time.LocalDate
 import java.util.GregorianCalendar
-import com.kosherjava.zmanim.hebrewcalendar.HebrewDateFormatter
-import com.kosherjava.zmanim.hebrewcalendar.JewishCalendar
-import com.kosherjava.zmanim.hebrewcalendar.JewishCalendar.Parsha
-import com.kosherjava.zmanim.hebrewcalendar.YomiCalculator
-import com.kosherjava.zmanim.hebrewcalendar.YerushalmiYomiCalculator
-import java.util.EnumMap
 import com.kosherjava.zmanim.AstronomicalCalendar
 import com.kosherjava.zmanim.ZmanimCalendar
-import java.math.BigDecimal
 import com.kosherjava.zmanim.ComplexZmanimCalendar
diff --git a/src/main/java/com/kosherjava/zmanim/util/package-info.kt b/src/main/java/com/kosherjava/zmanim/util/package-info.kt
index d3132b28..e9353c01 100644
--- a/src/main/java/com/kosherjava/zmanim/util/package-info.kt
+++ b/src/main/java/com/kosherjava/zmanim/util/package-info.kt
@@ -8,33 +8,6 @@
 package com.kosherjava.zmanim.util
 
 import com.kosherjava.zmanim.util.ZmanimFormatter
-import java.util.TimeZone
-import java.lang.StringBuffer
-import com.kosherjava.zmanim.util.Zman
-import java.lang.IllegalArgumentException
 import com.kosherjava.zmanim.util.GeoLocation
-import java.lang.StringBuilder
-import java.lang.CloneNotSupportedException
-import com.kosherjava.zmanim.util.AstronomicalCalculator
-import java.util.Calendar
 import com.kosherjava.zmanim.util.NOAACalculator
-import java.text.SimpleDateFormat
-import java.text.DecimalFormat
-import java.text.DateFormat
-import java.util.Collections
-import com.kosherjava.zmanim.util.GeoLocationUtils
 import com.kosherjava.zmanim.util.SunTimesCalculator
-import com.kosherjava.zmanim.hebrewcalendar.Daf
-import com.kosherjava.zmanim.hebrewcalendar.JewishDate
-import java.time.LocalDate
-import java.util.GregorianCalendar
-import com.kosherjava.zmanim.hebrewcalendar.HebrewDateFormatter
-import com.kosherjava.zmanim.hebrewcalendar.JewishCalendar
-import com.kosherjava.zmanim.hebrewcalendar.JewishCalendar.Parsha
-import com.kosherjava.zmanim.hebrewcalendar.YomiCalculator
-import com.kosherjava.zmanim.hebrewcalendar.YerushalmiYomiCalculator
-import java.util.EnumMap
-import com.kosherjava.zmanim.AstronomicalCalendar
-import com.kosherjava.zmanim.ZmanimCalendar
-import java.math.BigDecimal
-import com.kosherjava.zmanim.ComplexZmanimCalendar