diff --git a/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java b/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java
index 71e7ef8e09d..79c4ace75a7 100644
--- a/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java
+++ b/service/src/main/java/org/cbioportal/service/util/ExpressionEnrichmentUtil.java
@@ -1,13 +1,31 @@
 package org.cbioportal.service.util;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import io.swagger.models.auth.In;
+import org.cbioportal.model.EnrichmentType;
+import org.cbioportal.model.ExpressionEnrichment;
+import org.cbioportal.model.GenericAssayEnrichment;
+import org.cbioportal.model.GenericAssayBinaryEnrichment;
+import org.cbioportal.model.GenericAssayCategoricalEnrichment;
+import org.cbioportal.model.GenericAssayMolecularAlteration;
+import org.cbioportal.model.GenomicEnrichment;
+import org.cbioportal.model.GroupStatistics;
+import org.cbioportal.model.GenericAssayCountSummary;
+import org.cbioportal.model.MolecularAlteration;
+import org.cbioportal.model.MolecularProfile;
+import org.cbioportal.model.MolecularProfileCaseIdentifier;
+import org.cbioportal.model.MolecularProfileSamples;
+import org.cbioportal.model.Sample;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.math3.stat.StatUtils;
@@ -15,7 +33,6 @@
 import org.apache.commons.math3.stat.inference.ChiSquareTest;
 import org.apache.commons.math3.stat.inference.OneWayAnova;
 import org.apache.commons.math3.stat.inference.TestUtils;
-import org.cbioportal.model.*;
 import org.cbioportal.persistence.MolecularDataRepository;
 import org.cbioportal.service.SampleService;
 import org.springframework.beans.factory.annotation.Autowired;