optimize imports

community-boating · Jun 9, 2024 · a560091 · a560091
1 parent 141023d
commit a560091
Show file tree

Hide file tree

Showing 103 changed files with 10 additions and 304 deletions.
diff --git a/app/com/coleji/neptune/API/RestControllerWithDTO2.scala b/app/com/coleji/neptune/API/RestControllerWithDTO2.scala
@@ -1,7 +1,7 @@
 package com.coleji.neptune.API
 
 import com.coleji.neptune.Core.{PermissionsAuthority, UnlockedRequestCache}
-import com.coleji.neptune.Storable.{DTOClass, StorableClass, StorableObject}
+import com.coleji.neptune.Storable.{StorableClass, StorableObject}
 
 import scala.reflect.runtime.universe
 

diff --git a/app/com/coleji/neptune/Core/RelationalBroker.scala b/app/com/coleji/neptune/Core/RelationalBroker.scala
@@ -563,6 +563,7 @@ abstract class RelationalBroker private[Core](dbGateway: DatabaseGateway, prepar
 		withConnection(pool)(conn => {
 			println("STARTING PROCEDURE CALL: " + pc.getQuery)
 			val callable: CallableStatement = conn.prepareCall(s"{call ${pc.getQuery}}")
+
 			// register outs and inouts
 			pc.registerOutParameters.foreach(Function.tupled((paramName: String, dataType: Int) => {
 				callable.registerOutParameter(paramName, dataType)
@@ -582,7 +583,6 @@ abstract class RelationalBroker private[Core](dbGateway: DatabaseGateway, prepar
 				println(s"$paramName = $value")
 				callable.setDouble(paramName, value)
 			}))
-			println("DONE WITH PARAM SETTING")
 
 			// Date params DO NOT WORK
 			// Everything will appear to work and then it will act as though the transaction was not committed
@@ -605,7 +605,7 @@ abstract class RelationalBroker private[Core](dbGateway: DatabaseGateway, prepar
 
 			val hadResults: Boolean = callable.execute()
 //			conn.commit()
-			println("DONE EXECUTING")
+
 			pc.getOutResults(callable)
 		})
 	}

diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Public/Sunset.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Public/Sunset.scala
@@ -1,10 +1,9 @@
 package org.sailcbi.APIServer.Api.Endpoints.Public
 
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority}
-import org.sailcbi.APIServer.Entities.EntityDefinitions.SunsetTime
 import org.sailcbi.APIServer.Entities.cacheable.sunset.{SunsetCache, SunsetCacheKey}
 import org.sailcbi.APIServer.UserTypes.PublicRequestCache
-import play.api.libs.json.{Json, Writes}
+import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, InjectedController}
 
 import javax.inject.Inject

diff --git a/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/PutClassInstructor.scala b/app/org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/ClassInstructor/PutClassInstructor.scala
@@ -1,6 +1,6 @@
 package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest.ClassInstructor
 
-import com.coleji.neptune.API.{RestControllerWithDTO, RestControllerWithDTO2, ValidationError, ValidationOk, ValidationResult}
+import com.coleji.neptune.API.{RestControllerWithDTO2, ValidationError, ValidationOk, ValidationResult}
 import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority, UnlockedRequestCache}
 import org.sailcbi.APIServer.Entities.EntityDefinitions.ClassInstructor
 import org.sailcbi.APIServer.Entities.access.CbiPermissions

diff --git a/...org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/PersonMembership/GetPersonMembership.scala b/...org/sailcbi/APIServer/Api/Endpoints/Staff/Rest/PersonMembership/GetPersonMembership.scala
@@ -1,7 +1,7 @@
 package org.sailcbi.APIServer.Api.Endpoints.Staff.Rest.PersonMembership
 
 import com.coleji.neptune.API.RestController
-import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority, RequestCache, UnlockedRequestCache}
+import com.coleji.neptune.Core.{ParsedRequest, PermissionsAuthority, RequestCache}
 import com.coleji.neptune.Storable.StorableQuery.QueryBuilder
 import org.sailcbi.APIServer.Entities.EntityDefinitions._
 import org.sailcbi.APIServer.UserTypes.StaffRequestCache

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AccessProfile.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class AccessProfile extends StorableClass(AccessProfile) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassFormat.scala
@@ -5,8 +5,6 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class ApClassFormat extends StorableClass(ApClassFormat) {
 	override object references extends ReferencesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassSignup.scala
@@ -5,8 +5,6 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class ApClassSignup extends StorableClass(ApClassSignup) {
 	override object references extends ReferencesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ApClassType.scala
@@ -5,8 +5,6 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class ApClassType extends StorableClass(ApClassType) {
 	override object references extends ReferencesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppIdIndex.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class AppIdIndex extends StorableClass(AppIdIndex) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/AppPrivilege.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class AppPrivilege extends StorableClass(AppPrivilege) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatRating.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class BoatRating extends StorableClass(BoatRating) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BoatType.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class BoatType extends StorableClass(BoatType) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/BudgetItem.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class BudgetItem extends StorableClass(BudgetItem) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CardDismissal.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class CardDismissal extends StorableClass(CardDismissal) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcErrorCode.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class CcErrorCode extends StorableClass(CcErrorCode) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CcLog.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class CcLog extends StorableClass(CcLog) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ClassLocation.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class ClassLocation extends StorableClass(ClassLocation) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/CommentsTable.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class CommentsTable extends StorableClass(CommentsTable) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Countrie.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class Countrie extends StorableClass(Countrie) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DamageWaiver.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class DamageWaiver extends StorableClass(DamageWaiver) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DhGlobal.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class DhGlobal extends StorableClass(DhGlobal) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Discount.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class Discount extends StorableClass(Discount) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DiscountCode.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class DiscountCode extends StorableClass(DiscountCode) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DockReport.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class DockReport extends StorableClass(DockReport) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Donation.scala
@@ -5,8 +5,6 @@ import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
 import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class Donation extends StorableClass(Donation) {
 	override object references extends ReferencesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/DonationFund.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class DonationFund extends StorableClass(DonationFund) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiMit.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class EiiMit extends StorableClass(EiiMit) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiOverride.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class EiiOverride extends StorableClass(EiiOverride) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EiiResponse.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class EiiResponse extends StorableClass(EiiResponse) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/EmailContent.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class EmailContent extends StorableClass(EmailContent) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/ErrorType.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class ErrorType extends StorableClass(ErrorType) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Event.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class Event extends StorableClass(Event) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/Feedback.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class Feedback extends StorableClass(Feedback) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagChange.scala
@@ -3,10 +3,6 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
-import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class FlagChange extends StorableClass(FlagChange) {
 	override object values extends ValuesObject {

diff --git a/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala b/app/org/sailcbi/APIServer/Entities/EntityDefinitions/FlagsGlobal.scala
@@ -3,10 +3,7 @@ package org.sailcbi.APIServer.Entities.EntityDefinitions
 import com.coleji.neptune.Storable.FieldValues._
 import com.coleji.neptune.Storable.Fields._
 import com.coleji.neptune.Storable._
-import com.coleji.neptune.Util._
 import org.sailcbi.APIServer.Entities.NullableInDatabase
-import org.sailcbi.APIServer.Entities.entitycalculations._
-import play.api.libs.json._
 
 class FlagsGlobal extends StorableClass(FlagsGlobal) {
 	override object values extends ValuesObject {